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 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && 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);
434 eaccb85f 2018-12-25 stsp got_repo_close(repo);
435 7ac97322 2018-03-11 stsp free(path_got);
436 056e7441 2018-03-11 stsp free(path_lock);
437 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
438 c442a90d 2019-03-10 stsp free(uuidstr);
439 bd165944 2019-03-10 stsp free(formatstr);
441 6d9d28c3 2018-03-11 stsp if (fd != -1)
443 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
444 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
445 6d9d28c3 2018-03-11 stsp *worktree = NULL;
447 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
449 6d9d28c3 2018-03-11 stsp return err;
452 247140b2 2019-02-05 stsp const struct got_error *
453 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
455 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
456 aedea96d 2020-10-20 stsp char *worktree_path;
458 aedea96d 2020-10-20 stsp worktree_path = strdup(path);
459 aedea96d 2020-10-20 stsp if (worktree_path == NULL)
460 aedea96d 2020-10-20 stsp return got_error_from_errno("strdup");
463 aedea96d 2020-10-20 stsp char *parent_path;
465 aedea96d 2020-10-20 stsp err = open_worktree(worktree, worktree_path);
466 aedea96d 2020-10-20 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT)) {
467 aedea96d 2020-10-20 stsp free(worktree_path);
468 247140b2 2019-02-05 stsp return err;
470 aedea96d 2020-10-20 stsp if (*worktree) {
471 aedea96d 2020-10-20 stsp free(worktree_path);
472 aedea96d 2020-10-20 stsp return NULL;
474 aedea96d 2020-10-20 stsp if (worktree_path[0] == '/' && worktree_path[1] == '\0')
476 aedea96d 2020-10-20 stsp err = got_path_dirname(&parent_path, worktree_path);
478 aedea96d 2020-10-20 stsp if (err->code != GOT_ERR_BAD_PATH) {
479 aedea96d 2020-10-20 stsp free(worktree_path);
480 aedea96d 2020-10-20 stsp return err;
484 aedea96d 2020-10-20 stsp free(worktree_path);
485 aedea96d 2020-10-20 stsp worktree_path = parent_path;
488 aedea96d 2020-10-20 stsp free(worktree_path);
489 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
492 3a6ce05a 2019-02-11 stsp const struct got_error *
493 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
495 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
496 cde76477 2018-03-11 stsp free(worktree->repo_path);
497 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
498 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
499 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
500 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
501 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
502 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
503 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
504 7f11502c 2019-08-28 hiltjo free(worktree->root_path);
505 50b0790e 2020-09-11 stsp free(worktree->gotconfig_path);
506 50b0790e 2020-09-11 stsp got_gotconfig_free(worktree->gotconfig);
507 6d9d28c3 2018-03-11 stsp free(worktree);
508 3a6ce05a 2019-02-11 stsp return err;
511 2fbdb5ae 2018-12-29 stsp const char *
512 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
514 c7f4312f 2019-02-05 stsp return worktree->root_path;
517 c7f4312f 2019-02-05 stsp const char *
518 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
520 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
522 49520a32 2018-12-29 stsp const char *
523 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
525 f609be2e 2018-12-29 stsp return worktree->path_prefix;
528 e5dc7198 2018-12-29 stsp const struct got_error *
529 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
530 e5dc7198 2018-12-29 stsp const char *path_prefix)
532 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
534 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
535 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
536 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
538 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
539 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
540 e5dc7198 2018-12-29 stsp free(absprefix);
541 e5dc7198 2018-12-29 stsp return NULL;
544 bc70eb79 2019-05-09 stsp const char *
545 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
547 36a38700 2019-05-10 stsp return worktree->head_ref_name;
550 024e9686 2019-05-14 stsp const struct got_error *
551 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
552 024e9686 2019-05-14 stsp struct got_reference *head_ref)
554 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
555 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
557 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
558 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
559 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
560 024e9686 2019-05-14 stsp path_got = NULL;
564 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
565 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
566 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
570 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
574 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
575 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
577 024e9686 2019-05-14 stsp free(path_got);
579 024e9686 2019-05-14 stsp free(head_ref_name);
580 024e9686 2019-05-14 stsp return err;
583 b72f483a 2019-02-05 stsp struct got_object_id *
584 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
586 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
589 507dc3bb 2018-12-29 stsp const struct got_error *
590 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
591 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
593 507dc3bb 2018-12-29 stsp const struct got_error *err;
594 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
595 507dc3bb 2018-12-29 stsp char *id_str = NULL;
596 507dc3bb 2018-12-29 stsp char *path_got = NULL;
598 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
599 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
600 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
601 507dc3bb 2018-12-29 stsp path_got = NULL;
605 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
607 507dc3bb 2018-12-29 stsp return err;
609 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
610 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
614 507dc3bb 2018-12-29 stsp /* Record our base commit. */
615 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
618 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
622 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
623 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
624 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
625 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
630 507dc3bb 2018-12-29 stsp got_object_close(obj);
631 507dc3bb 2018-12-29 stsp free(id_str);
632 507dc3bb 2018-12-29 stsp free(path_got);
633 507dc3bb 2018-12-29 stsp return err;
636 50b0790e 2020-09-11 stsp const struct got_gotconfig *
637 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
639 50b0790e 2020-09-11 stsp return worktree->gotconfig;
642 9d31a1d8 2018-03-11 stsp static const struct got_error *
643 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
645 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
646 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
647 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
648 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
649 86c3caaf 2018-03-09 stsp return NULL;
652 21908da4 2019-01-13 stsp static const struct got_error *
653 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
655 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
656 4a1ddfc2 2019-01-12 stsp char *abspath;
658 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
659 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
661 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
662 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
663 ddcd8544 2019-03-11 stsp struct stat sb;
664 ddcd8544 2019-03-11 stsp err = NULL;
665 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
666 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
667 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
668 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
669 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
672 4a1ddfc2 2019-01-12 stsp free(abspath);
673 68c76935 2019-02-19 stsp return err;
676 68c76935 2019-02-19 stsp static const struct got_error *
677 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
679 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
680 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
681 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
682 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
687 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
688 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
692 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
693 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
694 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
697 68c76935 2019-02-19 stsp if (flen1 == 0) {
698 68c76935 2019-02-19 stsp if (flen2 != 0)
701 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
702 68c76935 2019-02-19 stsp if (flen1 != 0)
705 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
706 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
716 68c76935 2019-02-19 stsp return err;
719 68c76935 2019-02-19 stsp static const struct got_error *
720 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
722 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
723 68c76935 2019-02-19 stsp struct stat sb;
724 68c76935 2019-02-19 stsp size_t size1, size2;
725 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
729 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
730 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
733 68c76935 2019-02-19 stsp size1 = sb.st_size;
735 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
736 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
739 68c76935 2019-02-19 stsp size2 = sb.st_size;
741 68c76935 2019-02-19 stsp if (size1 != size2) {
743 68c76935 2019-02-19 stsp return NULL;
746 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
747 68c76935 2019-02-19 stsp if (f1 == NULL)
748 60522982 2019-12-15 stsp return got_error_from_errno2("fopen", f1_path);
750 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
751 68c76935 2019-02-19 stsp if (f2 == NULL) {
752 60522982 2019-12-15 stsp err = got_error_from_errno2("fopen", f2_path);
756 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
758 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
759 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
760 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
761 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
763 6353ad76 2019-02-08 stsp return err;
767 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
768 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
769 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
771 6353ad76 2019-02-08 stsp static const struct got_error *
772 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
773 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
774 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
775 f69721c3 2019-10-21 stsp const char *label_orig, const char *label_deriv,
776 f69721c3 2019-10-21 stsp struct got_repository *repo,
777 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
779 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
780 6353ad76 2019-02-08 stsp int merged_fd = -1;
781 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
782 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
783 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
784 234035bc 2019-06-01 stsp int overlapcnt = 0;
785 3524bbf9 2020-10-20 stsp char *parent = NULL;
786 3b9f0f87 2020-07-23 stsp char *symlink_path = NULL;
787 3b9f0f87 2020-07-23 stsp FILE *symlinkf = NULL;
789 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
791 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
793 3524bbf9 2020-10-20 stsp return err;
795 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
796 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
800 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
804 af54ae4a 2019-02-19 stsp free(base_path);
805 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
806 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
807 af54ae4a 2019-02-19 stsp base_path = NULL;
811 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
814 46b6ee73 2019-06-04 stsp if (blob_orig) {
815 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
816 46b6ee73 2019-06-04 stsp blob_orig);
821 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
822 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
823 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
828 3b9f0f87 2020-07-23 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
829 3b9f0f87 2020-07-23 stsp * target path into a temporary file and use that file with diff3.
831 3b9f0f87 2020-07-23 stsp if (S_ISLNK(st_mode)) {
832 3b9f0f87 2020-07-23 stsp char target_path[PATH_MAX];
833 3b9f0f87 2020-07-23 stsp ssize_t target_len;
836 3b9f0f87 2020-07-23 stsp free(base_path);
837 3b9f0f87 2020-07-23 stsp if (asprintf(&base_path, "%s/got-symlink-merge",
838 3b9f0f87 2020-07-23 stsp parent) == -1) {
839 3b9f0f87 2020-07-23 stsp err = got_error_from_errno("asprintf");
840 3b9f0f87 2020-07-23 stsp base_path = NULL;
843 3b9f0f87 2020-07-23 stsp err = got_opentemp_named(&symlink_path, &symlinkf, base_path);
846 3b9f0f87 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
847 3b9f0f87 2020-07-23 stsp sizeof(target_path));
848 3b9f0f87 2020-07-23 stsp if (target_len == -1) {
849 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
852 3b9f0f87 2020-07-23 stsp n = fwrite(target_path, 1, target_len, symlinkf);
853 3b9f0f87 2020-07-23 stsp if (n != target_len) {
854 3b9f0f87 2020-07-23 stsp err = got_ferror(symlinkf, GOT_ERR_IO);
857 3b9f0f87 2020-07-23 stsp if (fflush(symlinkf) == EOF) {
858 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("fflush", symlink_path);
863 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
864 3b9f0f87 2020-07-23 stsp blob_orig_path, symlink_path ? symlink_path : ondisk_path,
865 3b9f0f87 2020-07-23 stsp label_deriv, label_orig, NULL);
869 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
870 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
874 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
875 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
879 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
880 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
881 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
882 68c76935 2019-02-19 stsp merged_path);
887 2ad902c0 2019-12-15 stsp if (fchmod(merged_fd, st_mode) != 0) {
888 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
892 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
893 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
894 230a42bd 2019-05-11 jcs ondisk_path);
899 fdcb7daf 2019-12-15 stsp if (merged_path)
900 fdcb7daf 2019-12-15 stsp unlink(merged_path);
902 3b9f0f87 2020-07-23 stsp if (symlink_path) {
903 3b9f0f87 2020-07-23 stsp if (unlink(symlink_path) == -1 && err == NULL)
904 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("unlink", symlink_path);
906 3b9f0f87 2020-07-23 stsp if (symlinkf && fclose(symlinkf) == EOF && err == NULL)
907 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("fclose", symlink_path);
908 3b9f0f87 2020-07-23 stsp free(symlink_path);
909 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
910 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
911 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
912 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
913 6353ad76 2019-02-08 stsp free(merged_path);
914 af54ae4a 2019-02-19 stsp free(base_path);
915 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
916 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
917 46b6ee73 2019-06-04 stsp free(blob_orig_path);
919 3524bbf9 2020-10-20 stsp free(parent);
920 af57b12a 2020-07-23 stsp return err;
923 af57b12a 2020-07-23 stsp static const struct got_error *
924 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
925 af57b12a 2020-07-23 stsp size_t target_len)
927 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
928 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
929 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
930 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
931 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
932 af57b12a 2020-07-23 stsp ondisk_path);
933 af57b12a 2020-07-23 stsp return NULL;
937 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
938 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
939 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
940 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
942 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
943 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
945 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
946 993e2a1b 2020-07-23 stsp * has deleted this symlink.
948 11cc08c1 2020-07-23 stsp static const struct got_error *
949 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
950 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
951 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
953 11cc08c1 2020-07-23 stsp const struct got_error *err;
954 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
955 11cc08c1 2020-07-23 stsp FILE *f = NULL;
957 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
959 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
961 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
962 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
963 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
967 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
971 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
972 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
973 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
974 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
975 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
976 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
977 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
978 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
979 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
980 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
984 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
985 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
988 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
989 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
992 11cc08c1 2020-07-23 stsp if (chmod(ondisk_path, GOT_DEFAULT_FILE_MODE) == -1) {
993 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("chmod", ondisk_path);
997 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
998 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
999 11cc08c1 2020-07-23 stsp free(path);
1000 11cc08c1 2020-07-23 stsp free(id_str);
1001 11cc08c1 2020-07-23 stsp free(label_deriv);
1002 11cc08c1 2020-07-23 stsp return err;
1005 d219f183 2020-07-23 stsp /* forward declaration */
1006 d219f183 2020-07-23 stsp static const struct got_error *
1007 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
1008 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
1009 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
1010 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
1013 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
1014 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
1015 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
1016 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
1018 af57b12a 2020-07-23 stsp static const struct got_error *
1019 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
1020 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
1021 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
1022 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1023 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1025 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
1026 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
1027 af57b12a 2020-07-23 stsp struct stat sb;
1028 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
1029 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
1030 11cc08c1 2020-07-23 stsp int have_local_change = 0;
1031 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
1033 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
1034 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
1036 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
1037 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
1038 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
1039 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
1040 af57b12a 2020-07-23 stsp ondisk_path);
1041 af57b12a 2020-07-23 stsp goto done;
1043 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
1045 526a746f 2020-07-23 stsp if (blob_orig) {
1046 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
1048 526a746f 2020-07-23 stsp goto done;
1051 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1052 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
1053 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
1054 11cc08c1 2020-07-23 stsp have_local_change = 1;
1056 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
1057 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1058 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
1059 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
1060 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
1062 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
1063 11cc08c1 2020-07-23 stsp if (ancestor_target) {
1064 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
1065 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1067 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
1068 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1069 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
1070 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1073 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
1074 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1075 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
1076 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
1078 11cc08c1 2020-07-23 stsp goto done;
1079 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1082 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
1083 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
1084 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
1085 af57b12a 2020-07-23 stsp strlen(deriv_target));
1087 af57b12a 2020-07-23 stsp goto done;
1088 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1089 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
1090 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
1091 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
1092 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
1093 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1096 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1097 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
1098 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
1100 ea7786be 2020-07-23 stsp goto done;
1101 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1107 af57b12a 2020-07-23 stsp free(ancestor_target);
1108 14c901f1 2019-08-08 stsp return err;
1112 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
1113 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
1114 14c901f1 2019-08-08 stsp * acts as the second derived version.
1116 14c901f1 2019-08-08 stsp static const struct got_error *
1117 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1118 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
1119 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
1120 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
1121 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1122 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1124 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
1125 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
1126 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1127 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
1129 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
1131 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1133 ed6b5030 2020-10-20 stsp return err;
1135 14c901f1 2019-08-08 stsp free(base_path);
1136 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1137 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1138 14c901f1 2019-08-08 stsp base_path = NULL;
1139 14c901f1 2019-08-08 stsp goto done;
1142 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1144 14c901f1 2019-08-08 stsp goto done;
1145 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1146 14c901f1 2019-08-08 stsp blob_deriv);
1148 14c901f1 2019-08-08 stsp goto done;
1150 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1152 14c901f1 2019-08-08 stsp goto done;
1153 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1154 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1155 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1156 14c901f1 2019-08-08 stsp goto done;
1159 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
1160 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
1161 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
1163 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
1164 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1165 14c901f1 2019-08-08 stsp free(base_path);
1166 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1167 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1168 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1170 6353ad76 2019-02-08 stsp free(id_str);
1171 818c7501 2019-07-11 stsp free(label_deriv);
1172 ed6b5030 2020-10-20 stsp free(parent);
1173 4a1ddfc2 2019-01-12 stsp return err;
1176 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1177 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1178 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1179 65b05cec 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_object_id *blob_id)
1181 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1182 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1184 65b05cec 2020-07-23 stsp *new_iep = NULL;
1186 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1188 054041d0 2020-06-24 stsp return err;
1190 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(new_ie, ondisk_path,
1191 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1193 054041d0 2020-06-24 stsp goto done;
1195 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1198 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1200 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1201 13d9040b 2019-03-27 stsp return err;
1204 1ebedb77 2019-10-19 stsp static mode_t
1205 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1207 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1209 1ebedb77 2019-10-19 stsp if (executable) {
1210 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1211 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1212 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1213 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1214 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1215 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1218 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1221 8ba819a3 2020-07-23 stsp /* forward declaration */
1222 13d9040b 2019-03-27 stsp static const struct got_error *
1223 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1224 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1225 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1226 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1227 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1228 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1231 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1232 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1234 8ba819a3 2020-07-23 stsp static const struct got_error *
1235 5a1fbc73 2020-07-23 stsp replace_existing_symlink(const char *ondisk_path, const char *target_path,
1236 5a1fbc73 2020-07-23 stsp size_t target_len)
1238 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1239 5a1fbc73 2020-07-23 stsp ssize_t elen;
1240 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1244 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1245 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1246 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1247 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1248 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1249 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1251 5a1fbc73 2020-07-23 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1252 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1253 5a1fbc73 2020-07-23 stsp if (errno != ELOOP)
1254 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1256 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1257 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1258 5a1fbc73 2020-07-23 stsp if (elen == -1)
1259 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1261 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1262 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1263 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1266 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1267 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1268 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1269 5a1fbc73 2020-07-23 stsp return err;
1272 3c1ec782 2020-07-23 stsp static const struct got_error *
1273 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1274 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1276 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1277 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1278 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1280 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1282 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1283 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1284 3c1ec782 2020-07-23 stsp return NULL;
1288 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1289 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1290 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1291 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1292 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1294 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1295 3c1ec782 2020-07-23 stsp char *abspath;
1296 3c1ec782 2020-07-23 stsp char *parent = dirname(ondisk_path);
1297 3c1ec782 2020-07-23 stsp if (parent == NULL)
1298 3c1ec782 2020-07-23 stsp return got_error_from_errno2("dirname", ondisk_path);
1299 3c1ec782 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1)
1300 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1301 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1302 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1303 3c1ec782 2020-07-23 stsp free(abspath);
1304 3c1ec782 2020-07-23 stsp return err;
1306 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1307 3c1ec782 2020-07-23 stsp free(abspath);
1309 3c1ec782 2020-07-23 stsp return err;
1311 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1313 3c1ec782 2020-07-23 stsp return err;
1316 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1317 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1318 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1319 3c1ec782 2020-07-23 stsp return NULL;
1322 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1323 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1324 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1325 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1326 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1327 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1329 3c1ec782 2020-07-23 stsp free(path_got);
1330 3c1ec782 2020-07-23 stsp return NULL;
1333 5a1fbc73 2020-07-23 stsp static const struct got_error *
1334 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1335 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1336 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1337 c90c8ce3 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1338 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1340 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1341 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1342 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1343 906c123b 2020-07-23 stsp char *path_got = NULL;
1344 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1345 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1347 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1350 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1351 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1352 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1353 8ba819a3 2020-07-23 stsp * in the blob object.
1356 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1357 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1358 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1359 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1360 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1361 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1362 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1363 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1364 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1365 3b9f0f87 2020-07-23 stsp progress_arg);
1367 8ba819a3 2020-07-23 stsp if (len > 0) {
1368 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1369 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1370 8ba819a3 2020-07-23 stsp len - hdrlen);
1371 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1372 8ba819a3 2020-07-23 stsp hdrlen = 0;
1374 8ba819a3 2020-07-23 stsp } while (len != 0);
1375 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1377 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1378 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1380 3c1ec782 2020-07-23 stsp return err;
1382 3c1ec782 2020-07-23 stsp if (*is_bad_symlink) {
1383 906c123b 2020-07-23 stsp /* install as a regular file */
1384 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1385 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1386 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1387 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1388 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1389 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1390 906c123b 2020-07-23 stsp goto done;
1393 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1394 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1395 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1396 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1397 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1398 c90c8ce3 2020-07-23 stsp goto done;
1400 5a1fbc73 2020-07-23 stsp err = replace_existing_symlink(ondisk_path,
1401 5a1fbc73 2020-07-23 stsp target_path, target_len);
1403 f35fa46a 2020-07-23 stsp goto done;
1404 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1405 5a1fbc73 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1406 6e1eade5 2020-07-23 stsp reverting_versioned_file ?
1407 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
1410 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1413 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1414 f35fa46a 2020-07-23 stsp char *parent = dirname(ondisk_path);
1415 f35fa46a 2020-07-23 stsp if (parent == NULL) {
1416 f35fa46a 2020-07-23 stsp err = got_error_from_errno2("dirname",
1417 f35fa46a 2020-07-23 stsp ondisk_path);
1418 f35fa46a 2020-07-23 stsp goto done;
1420 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1422 f35fa46a 2020-07-23 stsp goto done;
1424 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1425 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1427 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1428 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1429 f35fa46a 2020-07-23 stsp goto done;
1433 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1434 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1435 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1436 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1437 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1438 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1439 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1440 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1441 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1442 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1443 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1444 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1445 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1447 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1448 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1450 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1451 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1452 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1454 906c123b 2020-07-23 stsp free(path_got);
1455 8ba819a3 2020-07-23 stsp return err;
1458 8ba819a3 2020-07-23 stsp static const struct got_error *
1459 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1460 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1461 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1462 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1463 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1464 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1466 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1467 507dc3bb 2018-12-29 stsp int fd = -1;
1468 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1469 507dc3bb 2018-12-29 stsp int update = 0;
1470 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1472 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1473 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1474 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1475 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1476 21908da4 2019-01-13 stsp char *parent = dirname(path);
1477 21908da4 2019-01-13 stsp if (parent == NULL)
1478 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
1479 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1481 21908da4 2019-01-13 stsp return err;
1482 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1483 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1484 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1485 21908da4 2019-01-13 stsp if (fd == -1)
1486 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1487 230a42bd 2019-05-11 jcs ondisk_path);
1488 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1489 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1490 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1491 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1492 3b9f0f87 2020-07-23 stsp goto done;
1494 bd6aa359 2020-07-23 stsp if (!S_ISREG(st_mode) && !installing_bad_symlink) {
1495 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1496 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1497 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1498 507dc3bb 2018-12-29 stsp goto done;
1500 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1501 507dc3bb 2018-12-29 stsp ondisk_path);
1503 507dc3bb 2018-12-29 stsp goto done;
1504 507dc3bb 2018-12-29 stsp update = 1;
1507 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1510 bd6aa359 2020-07-23 stsp if (progress_cb) {
1511 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1512 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1514 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1515 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1518 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1519 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1521 bd6aa359 2020-07-23 stsp goto done;
1524 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1526 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1527 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1530 9d31a1d8 2018-03-11 stsp if (len > 0) {
1531 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1532 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1533 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1534 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1535 b87c6f83 2018-12-24 stsp goto done;
1536 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1537 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1538 b87c6f83 2018-12-24 stsp goto done;
1540 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1542 9d31a1d8 2018-03-11 stsp } while (len != 0);
1544 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1545 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1546 816dc654 2019-02-16 stsp goto done;
1549 507dc3bb 2018-12-29 stsp if (update) {
1550 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1551 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1552 230a42bd 2019-05-11 jcs ondisk_path);
1553 2a57020b 2019-02-20 stsp unlink(tmppath);
1554 68ed9ba5 2019-02-10 stsp goto done;
1558 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1559 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1560 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1561 1ebedb77 2019-10-19 stsp goto done;
1565 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1566 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1567 507dc3bb 2018-12-29 stsp free(tmppath);
1568 6353ad76 2019-02-08 stsp return err;
1571 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1572 6353ad76 2019-02-08 stsp static const struct got_error *
1573 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1575 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1576 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1577 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1578 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1579 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1581 7154f6ce 2019-03-27 stsp int i = 0;
1582 7154f6ce 2019-03-27 stsp char *line;
1583 7154f6ce 2019-03-27 stsp size_t len;
1584 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1586 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1587 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1588 7154f6ce 2019-03-27 stsp if (line == NULL) {
1589 7154f6ce 2019-03-27 stsp if (feof(f))
1591 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1595 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1596 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1598 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1604 7154f6ce 2019-03-27 stsp return err;
1607 e2b1e152 2019-07-13 stsp static int
1608 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1610 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1611 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1614 1ebedb77 2019-10-19 stsp static int
1615 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1617 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1618 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1619 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1620 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1621 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1622 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1625 c363b2c1 2019-08-03 stsp static unsigned char
1626 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1628 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1629 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1630 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1631 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1632 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1633 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1634 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1636 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1640 a919d5c4 2020-07-23 stsp static const struct got_error *
1641 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1642 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1643 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1645 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1646 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1647 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1648 a919d5c4 2020-07-23 stsp ssize_t elen;
1649 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1650 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1651 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1653 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1655 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1657 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1659 a919d5c4 2020-07-23 stsp return err;
1660 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1662 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1663 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1665 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1667 a919d5c4 2020-07-23 stsp if (len > 0) {
1668 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1669 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1670 a919d5c4 2020-07-23 stsp len - hdrlen);
1671 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1672 a919d5c4 2020-07-23 stsp hdrlen = 0;
1674 a919d5c4 2020-07-23 stsp } while (len != 0);
1675 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1677 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1678 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1679 a919d5c4 2020-07-23 stsp if (elen == -1)
1680 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1682 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1683 a919d5c4 2020-07-23 stsp if (elen == -1)
1684 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1687 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1688 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1690 a919d5c4 2020-07-23 stsp return NULL;
1693 7154f6ce 2019-03-27 stsp static const struct got_error *
1694 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1695 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1696 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1698 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1699 6353ad76 2019-02-08 stsp struct got_object_id id;
1700 6353ad76 2019-02-08 stsp size_t hdrlen;
1701 1338848f 2019-12-13 stsp int fd = -1;
1702 6353ad76 2019-02-08 stsp FILE *f = NULL;
1703 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1704 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1705 6353ad76 2019-02-08 stsp size_t flen, blen;
1706 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1708 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1711 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1712 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1713 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1715 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1716 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1717 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1718 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1719 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1721 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1722 882ef1b9 2019-12-13 stsp goto done;
1724 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1725 3d35a492 2019-12-13 stsp goto done;
1728 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1729 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1730 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1731 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1732 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1733 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1734 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1735 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1736 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1737 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1739 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1740 3d35a492 2019-12-13 stsp goto done;
1742 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1743 1338848f 2019-12-13 stsp goto done;
1747 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1748 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1749 1338848f 2019-12-13 stsp goto done;
1752 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1753 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1754 1338848f 2019-12-13 stsp goto done;
1755 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1756 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1757 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1758 1338848f 2019-12-13 stsp goto done;
1761 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1762 f179e66d 2020-07-23 stsp goto done;
1764 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1765 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1766 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1767 1338848f 2019-12-13 stsp goto done;
1770 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1771 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1772 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1774 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1776 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1778 1338848f 2019-12-13 stsp goto done;
1780 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1781 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1782 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1783 a919d5c4 2020-07-23 stsp goto done;
1786 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1787 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1788 ab0d4361 2019-12-13 stsp if (fd == -1) {
1789 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1790 ab0d4361 2019-12-13 stsp goto done;
1794 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1795 6353ad76 2019-02-08 stsp if (f == NULL) {
1796 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1797 6353ad76 2019-02-08 stsp goto done;
1800 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1802 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1803 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1805 7154f6ce 2019-03-27 stsp goto done;
1806 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1807 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1808 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1809 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1810 7154f6ce 2019-03-27 stsp goto done;
1812 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1813 6353ad76 2019-02-08 stsp if (flen != 0)
1814 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1816 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1817 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1818 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1820 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1821 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1822 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1823 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1827 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1830 6353ad76 2019-02-08 stsp hdrlen = 0;
1833 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1834 7154f6ce 2019-03-27 stsp rewind(f);
1835 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1836 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1837 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1840 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1841 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1842 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1843 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1844 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1845 9d31a1d8 2018-03-11 stsp return err;
1849 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1850 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1852 e2b1e152 2019-07-13 stsp static const struct got_error *
1853 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1854 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1856 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1857 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1858 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1860 e2b1e152 2019-07-13 stsp return NULL;
1863 9d31a1d8 2018-03-11 stsp static const struct got_error *
1864 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1865 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1866 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1867 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1868 0584f854 2019-04-06 stsp void *progress_arg)
1870 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1871 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1872 6353ad76 2019-02-08 stsp char *ondisk_path;
1873 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1874 b8f41171 2019-02-10 stsp struct stat sb;
1876 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1877 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1880 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1881 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1882 a76c42e6 2019-08-03 stsp goto done;
1884 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1887 abb4604f 2019-07-27 stsp goto done;
1888 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1889 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1891 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1892 c90c8ce3 2020-07-23 stsp status = GOT_STATUS_UNVERSIONED;
1895 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1896 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1897 b8f41171 2019-02-10 stsp goto done;
1899 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1900 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1902 5036ab18 2020-04-18 stsp goto done;
1905 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1906 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1907 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1908 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1909 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1910 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1912 e2b1e152 2019-07-13 stsp goto done;
1913 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1915 6353ad76 2019-02-08 stsp goto done;
1917 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1918 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1919 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1920 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1921 b8f41171 2019-02-10 stsp goto done;
1925 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1927 6353ad76 2019-02-08 stsp goto done;
1929 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1930 234035bc 2019-06-01 stsp int update_timestamps;
1931 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1932 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1933 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1934 234035bc 2019-06-01 stsp struct got_object_id id2;
1935 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1936 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1938 f69721c3 2019-10-21 stsp goto done;
1940 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1941 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1942 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1943 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1944 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1945 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1946 f69721c3 2019-10-21 stsp goto done;
1948 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1949 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1950 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1951 234035bc 2019-06-01 stsp goto done;
1954 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1955 36bf999c 2020-07-23 stsp char *link_target;
1956 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1958 36bf999c 2020-07-23 stsp goto done;
1959 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1960 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1961 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1962 36bf999c 2020-07-23 stsp free(link_target);
1964 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1965 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1966 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1967 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1969 f69721c3 2019-10-21 stsp free(label_orig);
1970 234035bc 2019-06-01 stsp if (blob2)
1971 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1973 909d120e 2019-09-22 stsp goto done;
1975 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1976 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1977 234035bc 2019-06-01 stsp * unmodified files again.
1979 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1980 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1981 234035bc 2019-06-01 stsp update_timestamps);
1982 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1983 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1984 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1985 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1986 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1988 1ee397ad 2019-07-12 stsp goto done;
1989 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1990 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1992 13d9040b 2019-03-27 stsp goto done;
1994 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1995 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1996 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1997 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1998 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1999 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2000 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2002 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2003 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2004 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2005 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2006 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2009 13d9040b 2019-03-27 stsp goto done;
2012 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2013 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
2015 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2016 054041d0 2020-06-24 stsp worktree->base_commit_id, ondisk_path, path,
2017 054041d0 2020-06-24 stsp &blob->id);
2020 13d9040b 2019-03-27 stsp goto done;
2022 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2023 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2024 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2027 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2029 6353ad76 2019-02-08 stsp free(ondisk_path);
2030 8da9e5f4 2019-01-12 stsp return err;
2033 90285c3b 2019-01-08 stsp static const struct got_error *
2034 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2036 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2037 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
2039 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2040 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2042 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2043 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2044 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2046 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
2047 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
2048 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
2049 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2050 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2054 90285c3b 2019-01-08 stsp parent = dirname(parent);
2057 90285c3b 2019-01-08 stsp free(ondisk_path);
2058 90285c3b 2019-01-08 stsp return err;
2061 708d8e67 2019-03-27 stsp static const struct got_error *
2062 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2063 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2064 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2066 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2067 708d8e67 2019-03-27 stsp unsigned char status;
2068 708d8e67 2019-03-27 stsp struct stat sb;
2069 708d8e67 2019-03-27 stsp char *ondisk_path;
2071 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2072 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2074 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2076 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2078 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2080 5a58a424 2020-06-23 stsp goto done;
2082 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2083 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2084 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2085 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2086 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2087 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2088 993e2a1b 2020-07-23 stsp goto done;
2090 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2091 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2092 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2093 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2095 993e2a1b 2020-07-23 stsp goto done;
2096 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2097 993e2a1b 2020-07-23 stsp ie->path);
2098 993e2a1b 2020-07-23 stsp goto done;
2101 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2102 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2103 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2105 5a58a424 2020-06-23 stsp goto done;
2107 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2108 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2110 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
2113 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2115 5a58a424 2020-06-23 stsp goto done;
2116 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2117 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2119 5a58a424 2020-06-23 stsp goto done;
2121 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2124 5a58a424 2020-06-23 stsp free(ondisk_path);
2125 fc6346c4 2019-03-27 stsp return err;
2128 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2129 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2130 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2131 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2132 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2133 8da9e5f4 2019-01-12 stsp void *progress_arg;
2134 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2135 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2138 512f0d0e 2019-01-02 stsp static const struct got_error *
2139 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2140 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2142 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2144 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2145 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2147 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2148 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2151 8da9e5f4 2019-01-12 stsp static const struct got_error *
2152 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2154 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2156 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2157 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2159 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2160 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2163 9d31a1d8 2018-03-11 stsp static const struct got_error *
2164 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2166 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2167 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2168 8da9e5f4 2019-01-12 stsp char *path;
2170 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2171 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2173 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2174 63c5ca5d 2019-08-24 stsp return NULL;
2176 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2177 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2179 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2181 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2182 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2184 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2185 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2187 8da9e5f4 2019-01-12 stsp free(path);
2188 0cd1c46a 2019-03-11 stsp return err;
2191 b2118c49 2020-07-28 stsp const struct got_error *
2192 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2194 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2196 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2197 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2198 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2199 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2202 b2118c49 2020-07-28 stsp return NULL;
2205 818c7501 2019-07-11 stsp static const struct got_error *
2206 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2208 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2209 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2211 517bab73 2019-03-11 stsp *refname = NULL;
2213 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2215 b2118c49 2020-07-28 stsp return err;
2217 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2218 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2219 0647c563 2019-03-11 stsp *refname = NULL;
2221 517bab73 2019-03-11 stsp free(uuidstr);
2222 517bab73 2019-03-11 stsp return err;
2225 818c7501 2019-07-11 stsp const struct got_error *
2226 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2228 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2231 818c7501 2019-07-11 stsp static const struct got_error *
2232 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2234 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2235 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2238 818c7501 2019-07-11 stsp static const struct got_error *
2239 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2241 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2244 818c7501 2019-07-11 stsp static const struct got_error *
2245 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2247 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2248 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2251 818c7501 2019-07-11 stsp static const struct got_error *
2252 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2254 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2255 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2258 0ebf8283 2019-07-24 stsp static const struct got_error *
2259 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2261 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2262 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2265 0ebf8283 2019-07-24 stsp static const struct got_error *
2266 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2268 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2269 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2272 0ebf8283 2019-07-24 stsp static const struct got_error *
2273 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2275 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2276 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2279 0ebf8283 2019-07-24 stsp static const struct got_error *
2280 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2282 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2283 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2286 0ebf8283 2019-07-24 stsp const struct got_error *
2287 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2288 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2290 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2291 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2292 0ebf8283 2019-07-24 stsp *path = NULL;
2293 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2295 0ebf8283 2019-07-24 stsp return NULL;
2299 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2300 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2302 517bab73 2019-03-11 stsp static const struct got_error *
2303 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2305 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2306 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2307 517bab73 2019-03-11 stsp char *refname;
2309 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2311 517bab73 2019-03-11 stsp return err;
2313 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2315 0cd1c46a 2019-03-11 stsp goto done;
2317 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2319 0cd1c46a 2019-03-11 stsp free(refname);
2321 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2322 3e3a69f1 2019-07-25 stsp return err;
2325 3e3a69f1 2019-07-25 stsp static const struct got_error *
2326 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2328 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2330 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2331 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2332 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2333 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2335 9d31a1d8 2018-03-11 stsp return err;
2339 ebf99748 2019-05-09 stsp static const struct got_error *
2340 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2341 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2343 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2344 ebf99748 2019-05-09 stsp FILE *index = NULL;
2346 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2347 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2348 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2349 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2351 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2353 ebf99748 2019-05-09 stsp goto done;
2355 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2356 ebf99748 2019-05-09 stsp if (index == NULL) {
2357 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2358 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2360 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2361 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
2362 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2365 ebf99748 2019-05-09 stsp if (err) {
2366 ebf99748 2019-05-09 stsp free(*fileindex_path);
2367 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2368 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2369 ebf99748 2019-05-09 stsp *fileindex = NULL;
2371 ebf99748 2019-05-09 stsp return err;
2374 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2375 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2376 c932eeeb 2019-05-22 stsp const char *path;
2377 c932eeeb 2019-05-22 stsp size_t path_len;
2378 c932eeeb 2019-05-22 stsp const char *entry_name;
2379 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2380 a484d721 2019-06-10 stsp void *progress_arg;
2383 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2384 c932eeeb 2019-05-22 stsp static const struct got_error *
2385 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2387 1ee397ad 2019-07-12 stsp const struct got_error *err;
2388 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2390 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2391 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2392 c932eeeb 2019-05-22 stsp return NULL;
2393 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2394 102ff934 2019-06-11 stsp return NULL;
2396 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2397 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2398 c932eeeb 2019-05-22 stsp return NULL;
2400 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2401 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2402 edd02c5e 2019-07-11 stsp ie->path);
2404 1ee397ad 2019-07-12 stsp return err;
2406 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2407 c932eeeb 2019-05-22 stsp return NULL;
2410 9c6338c4 2019-06-02 stsp static const struct got_error *
2411 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2413 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2414 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2415 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2416 867630bb 2020-01-17 stsp struct timespec timeout;
2418 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2419 9c6338c4 2019-06-02 stsp fileindex_path);
2421 9c6338c4 2019-06-02 stsp goto done;
2423 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2425 9c6338c4 2019-06-02 stsp goto done;
2427 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2428 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2429 9c6338c4 2019-06-02 stsp fileindex_path);
2430 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2434 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2435 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2436 867630bb 2020-01-17 stsp * was recorded in the file index.
2438 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
2439 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
2440 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
2442 9c6338c4 2019-06-02 stsp if (new_index)
2443 9c6338c4 2019-06-02 stsp fclose(new_index);
2444 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2445 9c6338c4 2019-06-02 stsp return err;
2448 6ced4176 2019-07-12 stsp static const struct got_error *
2449 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2450 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2451 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2453 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2454 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2455 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2456 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2458 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2459 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2460 6ced4176 2019-07-12 stsp *tree_id = NULL;
2462 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2463 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2464 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2465 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2466 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2467 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2468 6ced4176 2019-07-12 stsp goto done;
2470 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2471 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2473 6ced4176 2019-07-12 stsp goto done;
2474 6ced4176 2019-07-12 stsp return NULL;
2477 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2479 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2480 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2481 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2482 6ced4176 2019-07-12 stsp goto done;
2485 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2486 6ced4176 2019-07-12 stsp in_repo_path);
2488 6ced4176 2019-07-12 stsp goto done;
2490 6ced4176 2019-07-12 stsp free(in_repo_path);
2491 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2493 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2495 6ced4176 2019-07-12 stsp goto done;
2497 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2498 6ced4176 2019-07-12 stsp /* Check out a single file. */
2499 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2500 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2501 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2502 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2503 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2504 6ced4176 2019-07-12 stsp goto done;
2506 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2507 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2508 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2509 6ced4176 2019-07-12 stsp goto done;
2512 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2513 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2515 6ced4176 2019-07-12 stsp return err;
2516 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2517 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2518 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2519 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2520 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, in_repo_path);
2526 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2527 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2528 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2529 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2530 6ced4176 2019-07-12 stsp goto done;
2532 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2533 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2534 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2535 6ced4176 2019-07-12 stsp goto done;
2540 6ced4176 2019-07-12 stsp free(in_repo_path);
2541 6ced4176 2019-07-12 stsp if (err) {
2542 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2543 6ced4176 2019-07-12 stsp free(*tree_relpath);
2544 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2545 6ced4176 2019-07-12 stsp free(*tree_id);
2546 6ced4176 2019-07-12 stsp *tree_id = NULL;
2548 07ed472d 2019-07-12 stsp return err;
2551 07ed472d 2019-07-12 stsp static const struct got_error *
2552 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2553 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2554 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2555 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2557 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2558 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2559 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2560 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2561 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2563 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2564 7f47418f 2019-12-20 stsp if (err) {
2565 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2566 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2567 7f47418f 2019-12-20 stsp goto done;
2568 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2569 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2571 7f47418f 2019-12-20 stsp return err;
2574 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2575 07ed472d 2019-07-12 stsp worktree->base_commit_id);
2577 07ed472d 2019-07-12 stsp goto done;
2579 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2581 07ed472d 2019-07-12 stsp goto done;
2583 07ed472d 2019-07-12 stsp if (entry_name &&
2584 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2585 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2586 07ed472d 2019-07-12 stsp goto done;
2589 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2590 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2591 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2592 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2593 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2594 07ed472d 2019-07-12 stsp arg.repo = repo;
2595 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2596 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2597 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2598 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2599 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2600 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2603 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2604 07ed472d 2019-07-12 stsp if (commit)
2605 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2606 6ced4176 2019-07-12 stsp return err;
2609 9d31a1d8 2018-03-11 stsp const struct got_error *
2610 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2611 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2612 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2613 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2615 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2616 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2617 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2618 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2619 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2620 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2621 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2622 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2623 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2624 f2ea84fa 2019-07-27 stsp int entry_type;
2625 f2ea84fa 2019-07-27 stsp char *relpath;
2626 f2ea84fa 2019-07-27 stsp char *entry_name;
2627 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2628 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2630 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2632 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2634 9d31a1d8 2018-03-11 stsp return err;
2636 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2637 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2638 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2639 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2640 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2641 f2ea84fa 2019-07-27 stsp goto done;
2644 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2645 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2646 f2ea84fa 2019-07-27 stsp if (err) {
2647 f2ea84fa 2019-07-27 stsp free(tpd);
2648 6ced4176 2019-07-12 stsp goto done;
2651 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2652 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2653 f2ea84fa 2019-07-27 stsp if (err) {
2654 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2655 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2656 f2ea84fa 2019-07-27 stsp free(tpd);
2657 f2ea84fa 2019-07-27 stsp goto done;
2660 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2662 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2666 51514078 2018-12-25 stsp * Read the file index.
2667 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2668 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2670 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2672 c4cdcb68 2019-04-03 stsp goto done;
2674 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2675 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2676 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2678 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2679 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2680 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2684 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2685 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2686 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2687 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2688 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2689 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2690 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2691 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2695 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2697 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2698 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2699 af12c6b9 2019-06-04 stsp err = sync_err;
2701 9c6338c4 2019-06-02 stsp free(fileindex_path);
2703 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2704 9d31a1d8 2018-03-11 stsp if (commit)
2705 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2706 5ade8233 2019-07-12 stsp if (fileindex)
2707 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2708 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2709 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2710 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2711 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2712 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2713 f2ea84fa 2019-07-27 stsp free(tpd);
2715 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2716 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2717 9d31a1d8 2018-03-11 stsp err = unlockerr;
2718 f8d1f275 2019-02-04 stsp return err;
2721 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2722 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2723 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2724 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2725 234035bc 2019-06-01 stsp void *progress_arg;
2726 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2727 234035bc 2019-06-01 stsp void *cancel_arg;
2728 f69721c3 2019-10-21 stsp const char *label_orig;
2729 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2732 234035bc 2019-06-01 stsp static const struct got_error *
2733 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2734 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2735 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2736 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2738 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2739 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2740 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2741 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2742 234035bc 2019-06-01 stsp struct stat sb;
2743 234035bc 2019-06-01 stsp unsigned char status;
2744 234035bc 2019-06-01 stsp int local_changes_subsumed;
2746 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2747 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2748 d6c87207 2019-08-02 stsp strlen(path2));
2749 1ee397ad 2019-07-12 stsp if (ie == NULL)
2750 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2751 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2753 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2754 234035bc 2019-06-01 stsp path2) == -1)
2755 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2757 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2760 234035bc 2019-06-01 stsp goto done;
2762 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2763 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2764 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2765 234035bc 2019-06-01 stsp goto done;
2767 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2768 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2769 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2770 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2771 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2772 234035bc 2019-06-01 stsp goto done;
2775 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2776 36bf999c 2020-07-23 stsp char *link_target2;
2777 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2779 36bf999c 2020-07-23 stsp goto done;
2780 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2781 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2782 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2783 36bf999c 2020-07-23 stsp free(link_target2);
2785 af57b12a 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2786 af57b12a 2020-07-23 stsp blob1, ondisk_path, path2, sb.st_mode,
2787 af57b12a 2020-07-23 stsp a->label_orig, blob2, a->commit_id2, repo,
2788 af57b12a 2020-07-23 stsp a->progress_cb, a->progress_arg);
2790 234035bc 2019-06-01 stsp } else if (blob1) {
2791 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2792 d6c87207 2019-08-02 stsp strlen(path1));
2793 1ee397ad 2019-07-12 stsp if (ie == NULL)
2794 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2795 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2797 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2798 2b92fad7 2019-06-02 stsp path1) == -1)
2799 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2801 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2804 2b92fad7 2019-06-02 stsp goto done;
2806 2b92fad7 2019-06-02 stsp switch (status) {
2807 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2808 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2809 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2811 1ee397ad 2019-07-12 stsp goto done;
2812 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2814 2b92fad7 2019-06-02 stsp goto done;
2816 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2818 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2819 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2820 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2821 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2823 1ee397ad 2019-07-12 stsp goto done;
2825 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2827 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2828 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2829 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2831 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2832 0a22ca1a 2020-09-23 stsp * exists in the repository.
2834 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2836 0a22ca1a 2020-09-23 stsp goto done;
2837 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2838 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2839 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2841 0a22ca1a 2020-09-23 stsp goto done;
2842 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2845 0a22ca1a 2020-09-23 stsp goto done;
2847 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2850 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2851 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2853 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2854 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2857 0a22ca1a 2020-09-23 stsp goto done;
2860 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2861 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2862 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2863 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2865 1ee397ad 2019-07-12 stsp goto done;
2867 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2868 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2870 1ee397ad 2019-07-12 stsp goto done;
2875 234035bc 2019-06-01 stsp } else if (blob2) {
2876 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2877 234035bc 2019-06-01 stsp path2) == -1)
2878 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2879 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2880 d6c87207 2019-08-02 stsp strlen(path2));
2882 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2883 7f91a133 2019-12-13 stsp -1, NULL, repo);
2885 234035bc 2019-06-01 stsp goto done;
2886 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2887 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2888 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2889 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2890 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2891 1ee397ad 2019-07-12 stsp status, path2);
2892 234035bc 2019-06-01 stsp goto done;
2894 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2895 36bf999c 2020-07-23 stsp char *link_target2;
2896 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2899 36bf999c 2020-07-23 stsp goto done;
2900 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2901 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2902 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2903 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2904 36bf999c 2020-07-23 stsp free(link_target2);
2905 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2906 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2907 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2908 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2909 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2910 526a746f 2020-07-23 stsp a->progress_arg);
2912 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2913 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2916 dfe9fba0 2020-07-23 stsp goto done;
2917 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2918 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2919 054041d0 2020-06-24 stsp ondisk_path, blob2->id.sha1,
2920 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2922 234035bc 2019-06-01 stsp goto done;
2925 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2926 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2927 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2928 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2929 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2930 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
2932 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2933 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2934 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2937 234035bc 2019-06-01 stsp goto done;
2938 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2940 234035bc 2019-06-01 stsp goto done;
2941 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2942 3969253a 2020-03-07 stsp NULL, NULL, 1);
2943 3969253a 2020-03-07 stsp if (err) {
2944 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2945 3969253a 2020-03-07 stsp goto done;
2947 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2948 2b92fad7 2019-06-02 stsp if (err) {
2949 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2950 2b92fad7 2019-06-02 stsp goto done;
2952 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2953 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2954 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2959 234035bc 2019-06-01 stsp free(ondisk_path);
2960 234035bc 2019-06-01 stsp return err;
2963 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2964 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2965 234035bc 2019-06-01 stsp struct got_repository *repo;
2968 234035bc 2019-06-01 stsp static const struct got_error *
2969 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2971 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2972 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2973 234035bc 2019-06-01 stsp unsigned char status;
2974 234035bc 2019-06-01 stsp struct stat sb;
2975 234035bc 2019-06-01 stsp char *ondisk_path;
2977 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2978 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2979 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2980 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2982 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2984 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2986 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2987 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2989 234035bc 2019-06-01 stsp return err;
2990 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2991 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2993 234035bc 2019-06-01 stsp return NULL;
2996 818c7501 2019-07-11 stsp static const struct got_error *
2997 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2998 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2999 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3000 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3001 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3003 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3004 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3005 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3006 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3007 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3009 03415a1a 2019-06-02 stsp if (commit_id1) {
3010 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3011 03415a1a 2019-06-02 stsp worktree->path_prefix);
3012 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3013 03415a1a 2019-06-02 stsp goto done;
3015 69d57f3d 2020-07-31 stsp if (tree_id1) {
3016 69d57f3d 2020-07-31 stsp char *id_str;
3018 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3020 03415a1a 2019-06-02 stsp goto done;
3022 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3024 f69721c3 2019-10-21 stsp goto done;
3026 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3027 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3028 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3029 f69721c3 2019-10-21 stsp free(id_str);
3030 f69721c3 2019-10-21 stsp goto done;
3032 f69721c3 2019-10-21 stsp free(id_str);
3035 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3036 234035bc 2019-06-01 stsp worktree->path_prefix);
3038 234035bc 2019-06-01 stsp goto done;
3040 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3042 234035bc 2019-06-01 stsp goto done;
3044 234035bc 2019-06-01 stsp arg.worktree = worktree;
3045 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3046 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3047 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3048 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3049 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3050 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3051 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3052 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3053 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3054 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3055 af12c6b9 2019-06-04 stsp err = sync_err;
3057 234035bc 2019-06-01 stsp if (tree1)
3058 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3059 234035bc 2019-06-01 stsp if (tree2)
3060 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3061 f69721c3 2019-10-21 stsp free(label_orig);
3062 818c7501 2019-07-11 stsp return err;
3065 818c7501 2019-07-11 stsp const struct got_error *
3066 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3067 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3068 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3069 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3071 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3072 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3073 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3074 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
3076 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3078 818c7501 2019-07-11 stsp return err;
3080 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3082 818c7501 2019-07-11 stsp goto done;
3084 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
3085 818c7501 2019-07-11 stsp mok_arg.repo = repo;
3086 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3087 818c7501 2019-07-11 stsp &mok_arg);
3089 818c7501 2019-07-11 stsp goto done;
3091 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3092 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3094 818c7501 2019-07-11 stsp if (fileindex)
3095 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3096 818c7501 2019-07-11 stsp free(fileindex_path);
3097 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3098 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3099 234035bc 2019-06-01 stsp err = unlockerr;
3100 234035bc 2019-06-01 stsp return err;
3103 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3104 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3105 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3106 927df6b7 2019-02-10 stsp const char *status_path;
3107 927df6b7 2019-02-10 stsp size_t status_path_len;
3108 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3109 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3110 f8d1f275 2019-02-04 stsp void *status_arg;
3111 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3112 f8d1f275 2019-02-04 stsp void *cancel_arg;
3113 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3114 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
3115 f2a9dc41 2019-12-13 tracey int report_unchanged;
3116 3143d852 2020-06-25 stsp int no_ignores;
3119 f8d1f275 2019-02-04 stsp static const struct got_error *
3120 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3121 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3122 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3123 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3125 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3126 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3127 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3128 927df6b7 2019-02-10 stsp struct stat sb;
3129 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3130 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3131 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3133 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3135 98eaaa12 2019-08-03 stsp return err;
3137 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3138 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3139 98eaaa12 2019-08-03 stsp return NULL;
3141 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3142 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3143 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3145 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3146 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3147 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3149 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3150 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3151 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3152 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3153 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3156 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3157 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3160 927df6b7 2019-02-10 stsp static const struct got_error *
3161 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3162 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3164 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3165 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3166 f8d1f275 2019-02-04 stsp char *abspath;
3168 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3169 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3171 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3172 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3173 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3174 927df6b7 2019-02-10 stsp return NULL;
3176 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3177 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3178 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3179 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3181 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3182 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3183 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3186 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3187 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3188 f8d1f275 2019-02-04 stsp free(abspath);
3189 9d31a1d8 2018-03-11 stsp return err;
3192 f8d1f275 2019-02-04 stsp static const struct got_error *
3193 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3195 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3196 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3197 2ec1f75b 2019-03-26 stsp unsigned char status;
3199 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3200 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3202 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3203 927df6b7 2019-02-10 stsp return NULL;
3205 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3206 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3207 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3208 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3210 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3211 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3212 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3216 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3218 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3220 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3221 6841da00 2019-08-08 stsp free((char *)pe->path);
3222 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3226 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3228 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3230 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3231 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3232 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3233 6841da00 2019-08-08 stsp free((char *)pe->path);
3235 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3238 6841da00 2019-08-08 stsp static const struct got_error *
3239 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3241 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3242 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3243 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3244 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3245 6841da00 2019-08-08 stsp size_t linesize = 0;
3246 6841da00 2019-08-08 stsp ssize_t linelen;
3248 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3249 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3250 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3251 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3253 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3254 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3255 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3257 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3258 bd8de430 2019-10-04 stsp if (line[0] == '#')
3261 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3262 bd8de430 2019-10-04 stsp if (line[0] == '!')
3265 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3266 6841da00 2019-08-08 stsp line) == -1) {
3267 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3268 6841da00 2019-08-08 stsp goto done;
3270 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3272 6841da00 2019-08-08 stsp goto done;
3274 6841da00 2019-08-08 stsp if (ferror(f)) {
3275 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3276 6841da00 2019-08-08 stsp goto done;
3279 6841da00 2019-08-08 stsp dirpath = strdup(path);
3280 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3281 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3282 6841da00 2019-08-08 stsp goto done;
3284 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3286 6841da00 2019-08-08 stsp free(line);
3287 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3288 6841da00 2019-08-08 stsp free(dirpath);
3289 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3291 6841da00 2019-08-08 stsp return err;
3295 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3297 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3299 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3300 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3301 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3302 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3304 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3305 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3307 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3309 bd8de430 2019-10-04 stsp pattern += 3;
3311 bd8de430 2019-10-04 stsp while (*p) {
3312 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3313 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3314 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3315 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3317 bd8de430 2019-10-04 stsp while (*p == '/')
3327 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3328 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3329 6841da00 2019-08-08 stsp * ignores backwards.
3331 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3332 6841da00 2019-08-08 stsp while (pe) {
3333 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3334 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3335 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3336 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3337 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3338 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3339 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3340 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3341 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3346 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3352 6841da00 2019-08-08 stsp static const struct got_error *
3353 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3354 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3356 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3357 6841da00 2019-08-08 stsp char *ignorespath;
3358 886cec17 2019-12-15 stsp int fd = -1;
3359 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3361 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3362 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3363 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3365 886cec17 2019-12-15 stsp if (dirfd != -1) {
3366 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3367 886cec17 2019-12-15 stsp if (fd == -1) {
3368 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3369 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3370 886cec17 2019-12-15 stsp ignorespath);
3372 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3373 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3374 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3375 886cec17 2019-12-15 stsp ignorespath);
3378 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3382 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3383 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3384 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3385 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3386 886cec17 2019-12-15 stsp ignorespath);
3388 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3391 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3392 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3393 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3394 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3395 6841da00 2019-08-08 stsp free(ignorespath);
3396 6841da00 2019-08-08 stsp return err;
3399 f8d1f275 2019-02-04 stsp static const struct got_error *
3400 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3402 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3403 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3404 f8d1f275 2019-02-04 stsp char *path = NULL;
3406 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3407 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3409 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3410 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3411 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3413 f8d1f275 2019-02-04 stsp path = de->d_name;
3416 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3417 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3418 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3419 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3420 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3421 f8d1f275 2019-02-04 stsp if (parent_path[0])
3422 f8d1f275 2019-02-04 stsp free(path);
3423 b72f483a 2019-02-05 stsp return err;
3426 347d1d3e 2019-07-12 stsp static const struct got_error *
3427 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3429 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3430 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3432 3143d852 2020-06-25 stsp if (a->no_ignores)
3433 3143d852 2020-06-25 stsp return NULL;
3435 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3436 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3438 3143d852 2020-06-25 stsp return err;
3440 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3441 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3443 3143d852 2020-06-25 stsp return err;
3446 3143d852 2020-06-25 stsp static const struct got_error *
3447 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3448 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3449 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3451 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3452 abb4604f 2019-07-27 stsp struct stat sb;
3454 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3456 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3457 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3459 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3460 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3461 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3462 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3463 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3464 abb4604f 2019-07-27 stsp return NULL;
3467 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3468 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3469 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3471 abb4604f 2019-07-27 stsp return NULL;
3474 3143d852 2020-06-25 stsp static const struct got_error *
3475 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3476 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3478 3143d852 2020-06-25 stsp const struct got_error *err;
3479 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3481 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3482 3143d852 2020-06-25 stsp ".cvsignore");
3484 3143d852 2020-06-25 stsp return err;
3486 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3487 3143d852 2020-06-25 stsp ".gitignore");
3489 3143d852 2020-06-25 stsp return err;
3491 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3492 3143d852 2020-06-25 stsp if (err) {
3493 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3494 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3495 3143d852 2020-06-25 stsp return err;
3497 3143d852 2020-06-25 stsp for (;;) {
3498 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3499 3143d852 2020-06-25 stsp ".cvsignore");
3502 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3503 3143d852 2020-06-25 stsp ".gitignore");
3506 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3507 3143d852 2020-06-25 stsp if (err) {
3508 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3509 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3512 b737c85a 2020-06-26 stsp free(parent_path);
3513 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3514 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3517 b737c85a 2020-06-26 stsp free(parent_path);
3518 b737c85a 2020-06-26 stsp free(next_parent_path);
3519 3143d852 2020-06-25 stsp return err;
3522 abb4604f 2019-07-27 stsp static const struct got_error *
3523 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3524 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3525 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3526 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3527 f2a9dc41 2019-12-13 tracey int report_unchanged)
3529 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3530 6fc93f37 2019-12-13 stsp int fd = -1;
3531 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3532 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3533 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3535 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3537 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3538 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3539 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3541 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3542 6fc93f37 2019-12-13 stsp if (fd == -1) {
3543 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3544 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3545 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3547 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3548 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3549 f2a9dc41 2019-12-13 tracey report_unchanged);
3551 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3552 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3553 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3554 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3555 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3556 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3557 abb4604f 2019-07-27 stsp arg.status_path = path;
3558 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3559 abb4604f 2019-07-27 stsp arg.repo = repo;
3560 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3561 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3562 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3563 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3564 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3565 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3566 022fae89 2019-12-06 tracey if (!no_ignores) {
3567 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3568 3143d852 2020-06-25 stsp worktree->root_path, path);
3570 3143d852 2020-06-25 stsp goto done;
3572 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3573 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3576 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3577 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
3578 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3579 927df6b7 2019-02-10 stsp free(ondisk_path);
3580 347d1d3e 2019-07-12 stsp return err;
3583 347d1d3e 2019-07-12 stsp const struct got_error *
3584 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3585 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3586 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3587 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3589 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3590 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3591 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3592 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3594 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3596 347d1d3e 2019-07-12 stsp return err;
3598 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3599 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3600 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3604 f8d1f275 2019-02-04 stsp free(fileindex_path);
3605 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3606 f8d1f275 2019-02-04 stsp return err;
3609 6c7ab921 2019-03-18 stsp const struct got_error *
3610 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3611 6c7ab921 2019-03-18 stsp const char *arg)
3613 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3614 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3615 6c7ab921 2019-03-18 stsp size_t len;
3616 00bb5ea0 2020-07-23 stsp struct stat sb;
3618 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3620 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3621 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3622 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3624 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3625 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3626 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3627 00bb5ea0 2020-07-23 stsp goto done;
3630 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3632 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3633 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3634 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3635 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3637 00bb5ea0 2020-07-23 stsp char *abspath = NULL;
3638 00bb5ea0 2020-07-23 stsp char canonpath[PATH_MAX];
3639 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3640 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3641 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3642 00bb5ea0 2020-07-23 stsp goto done;
3646 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3647 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3649 d0710d08 2019-07-22 stsp goto done;
3650 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3651 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3652 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3653 00bb5ea0 2020-07-23 stsp goto done;
3656 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3657 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3658 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3659 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3660 00bb5ea0 2020-07-23 stsp goto done;
3662 00bb5ea0 2020-07-23 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3663 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3664 00bb5ea0 2020-07-23 stsp goto done;
3669 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3670 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3671 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3672 6c7ab921 2019-03-18 stsp goto done;
3675 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3676 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3677 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3679 f6d88e1a 2019-05-29 stsp goto done;
3681 f6d88e1a 2019-05-29 stsp path = strdup("");
3682 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3683 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3684 f6d88e1a 2019-05-29 stsp goto done;
3688 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3689 6c7ab921 2019-03-18 stsp len = strlen(path);
3690 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3691 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3695 6c7ab921 2019-03-18 stsp free(resolved);
3696 d0710d08 2019-07-22 stsp free(cwd);
3697 6c7ab921 2019-03-18 stsp if (err == NULL)
3698 6c7ab921 2019-03-18 stsp *wt_path = path;
3700 6c7ab921 2019-03-18 stsp free(path);
3701 d00136be 2019-03-26 stsp return err;
3704 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3705 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3706 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3707 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3708 4e68cba3 2019-11-23 stsp void *progress_arg;
3709 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3712 4e68cba3 2019-11-23 stsp static const struct got_error *
3713 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3714 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3715 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3716 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3718 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3719 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3720 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3721 6d022e97 2019-08-04 stsp struct stat sb;
3722 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3724 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3725 dbb83fbd 2019-12-12 stsp relpath) == -1)
3726 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3728 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3730 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3731 12463d8b 2019-12-13 stsp de_name, a->repo);
3733 dbb83fbd 2019-12-12 stsp goto done;
3734 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3735 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3736 dbb83fbd 2019-12-12 stsp goto done;
3737 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3739 dbb83fbd 2019-12-12 stsp goto done;
3742 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3743 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3744 dbb83fbd 2019-12-12 stsp goto done;
3747 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3749 4e68cba3 2019-11-23 stsp goto done;
3750 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3751 3969253a 2020-03-07 stsp if (err) {
3752 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3753 3969253a 2020-03-07 stsp goto done;
3755 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3756 07f5b47a 2019-06-02 stsp if (err) {
3757 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3758 4e68cba3 2019-11-23 stsp goto done;
3761 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3763 dbb83fbd 2019-12-12 stsp return err;
3764 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3765 dbb83fbd 2019-12-12 stsp return NULL;
3766 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3769 d00136be 2019-03-26 stsp const struct got_error *
3770 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3771 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3772 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3773 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3775 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3776 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3777 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3778 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3779 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3781 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3783 d00136be 2019-03-26 stsp return err;
3785 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3787 d00136be 2019-03-26 stsp goto done;
3789 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3790 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3791 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3792 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3793 4e68cba3 2019-11-23 stsp saa.repo = repo;
3795 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3796 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3797 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3801 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3802 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3803 af12c6b9 2019-06-04 stsp err = sync_err;
3805 fb399478 2019-07-12 stsp free(fileindex_path);
3806 d00136be 2019-03-26 stsp if (fileindex)
3807 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3808 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3809 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3810 d00136be 2019-03-26 stsp err = unlockerr;
3811 6c7ab921 2019-03-18 stsp return err;
3814 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3815 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3816 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3817 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3818 f2a9dc41 2019-12-13 tracey void *progress_arg;
3819 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3820 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3821 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3822 766841c2 2020-08-13 stsp const char *status_codes;
3825 f2a9dc41 2019-12-13 tracey static const struct got_error *
3826 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3827 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3828 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3829 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3831 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3832 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3833 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3834 17ed4618 2019-06-02 stsp struct stat sb;
3835 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
3837 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3838 17ed4618 2019-06-02 stsp if (ie == NULL)
3839 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3841 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3842 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3843 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3844 9acbc4fa 2019-08-03 stsp return NULL;
3845 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3848 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3849 f2a9dc41 2019-12-13 tracey relpath) == -1)
3850 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3852 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3855 f2a9dc41 2019-12-13 tracey goto done;
3857 766841c2 2020-08-13 stsp if (a->status_codes) {
3858 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
3860 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
3861 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
3864 766841c2 2020-08-13 stsp if (i == ncodes) {
3865 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
3866 766841c2 2020-08-13 stsp free(ondisk_path);
3867 766841c2 2020-08-13 stsp return NULL;
3869 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
3870 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
3871 766841c2 2020-08-13 stsp static char msg[64];
3872 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
3873 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
3874 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
3875 766841c2 2020-08-13 stsp goto done;
3879 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3880 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3881 f2a9dc41 2019-12-13 tracey goto done;
3882 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3883 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3884 f2a9dc41 2019-12-13 tracey goto done;
3886 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3887 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3888 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3889 f2a9dc41 2019-12-13 tracey goto done;
3893 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3894 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3895 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3896 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3897 12463d8b 2019-12-13 stsp ondisk_path);
3898 12463d8b 2019-12-13 stsp goto done;
3900 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3901 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3902 12463d8b 2019-12-13 stsp goto done;
3905 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3907 15341bfd 2020-03-05 tracey if (parent == NULL) {
3908 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3909 15341bfd 2020-03-05 tracey goto done;
3911 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3912 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3913 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3914 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3915 15341bfd 2020-03-05 tracey parent);
3918 15341bfd 2020-03-05 tracey parent = dirname(parent);
3919 15341bfd 2020-03-05 tracey if (parent == NULL) {
3920 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3921 15341bfd 2020-03-05 tracey goto done;
3926 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3928 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3929 f2a9dc41 2019-12-13 tracey if (err)
3930 f2a9dc41 2019-12-13 tracey return err;
3931 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3932 f2a9dc41 2019-12-13 tracey return NULL;
3933 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3934 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3937 2ec1f75b 2019-03-26 stsp const struct got_error *
3938 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3939 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3940 766841c2 2020-08-13 stsp const char *status_codes,
3941 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3942 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3944 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3945 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3946 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3947 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3948 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3950 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3952 2ec1f75b 2019-03-26 stsp return err;
3954 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3956 2ec1f75b 2019-03-26 stsp goto done;
3958 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3959 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3960 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3961 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3962 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3963 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3964 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3965 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
3967 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3968 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3969 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3973 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3974 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3975 af12c6b9 2019-06-04 stsp err = sync_err;
3977 fb399478 2019-07-12 stsp free(fileindex_path);
3978 2ec1f75b 2019-03-26 stsp if (fileindex)
3979 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3980 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3981 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3982 2ec1f75b 2019-03-26 stsp err = unlockerr;
3983 33aa809d 2019-08-08 stsp return err;
3986 33aa809d 2019-08-08 stsp static const struct got_error *
3987 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3989 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3990 33aa809d 2019-08-08 stsp char *line = NULL;
3991 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3992 33aa809d 2019-08-08 stsp ssize_t linelen;
3994 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3995 33aa809d 2019-08-08 stsp if (linelen == -1) {
3996 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3997 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3998 33aa809d 2019-08-08 stsp goto done;
4000 33aa809d 2019-08-08 stsp return NULL;
4002 33aa809d 2019-08-08 stsp if (outfile) {
4003 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4004 33aa809d 2019-08-08 stsp if (n != linelen) {
4005 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4006 33aa809d 2019-08-08 stsp goto done;
4009 33aa809d 2019-08-08 stsp if (rejectfile) {
4010 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4011 33aa809d 2019-08-08 stsp if (n != linelen)
4012 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4015 33aa809d 2019-08-08 stsp free(line);
4016 2ec1f75b 2019-03-26 stsp return err;
4019 33aa809d 2019-08-08 stsp static const struct got_error *
4020 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4022 33aa809d 2019-08-08 stsp char *line = NULL;
4023 33aa809d 2019-08-08 stsp size_t linesize = 0;
4024 33aa809d 2019-08-08 stsp ssize_t linelen;
4026 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4027 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4028 500467ff 2019-09-25 hiltjo if (ferror(f))
4029 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4030 500467ff 2019-09-25 hiltjo return NULL;
4032 33aa809d 2019-08-08 stsp free(line);
4033 33aa809d 2019-08-08 stsp return NULL;
4036 33aa809d 2019-08-08 stsp static const struct got_error *
4037 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4038 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4039 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4041 33aa809d 2019-08-08 stsp const struct got_error *err;
4043 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4044 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4045 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4047 33aa809d 2019-08-08 stsp return err;
4048 33aa809d 2019-08-08 stsp (*line_cur1)++;
4050 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4051 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4052 33aa809d 2019-08-08 stsp if (rejectfile)
4053 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4055 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4057 33aa809d 2019-08-08 stsp return err;
4058 33aa809d 2019-08-08 stsp (*line_cur2)++;
4060 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4061 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4062 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4064 33aa809d 2019-08-08 stsp return err;
4065 33aa809d 2019-08-08 stsp (*line_cur2)++;
4067 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4068 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4069 33aa809d 2019-08-08 stsp if (rejectfile)
4070 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4072 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4074 33aa809d 2019-08-08 stsp return err;
4075 33aa809d 2019-08-08 stsp (*line_cur1)++;
4078 f1e81a05 2019-08-10 stsp return NULL;
4081 f1e81a05 2019-08-10 stsp static const struct got_error *
4082 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4083 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4085 f1e81a05 2019-08-10 stsp const struct got_error *err;
4087 f1e81a05 2019-08-10 stsp if (outfile) {
4088 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4089 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4090 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4092 f1e81a05 2019-08-10 stsp return err;
4093 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4096 f1e81a05 2019-08-10 stsp if (rejectfile) {
4097 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4098 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4099 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4101 f1e81a05 2019-08-10 stsp return err;
4102 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4106 33aa809d 2019-08-08 stsp return NULL;
4109 33aa809d 2019-08-08 stsp static const struct got_error *
4110 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
4111 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
4112 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
4113 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
4114 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4116 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4117 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
4118 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
4119 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
4120 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
4121 33aa809d 2019-08-08 stsp long pos1, pos2;
4122 33aa809d 2019-08-08 stsp FILE *hunkfile;
4124 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4126 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
4127 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
4128 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
4130 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
4131 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
4133 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
4134 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
4136 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
4137 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4138 33aa809d 2019-08-08 stsp goto done;
4140 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
4141 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4142 33aa809d 2019-08-08 stsp goto done;
4144 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4145 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4146 33aa809d 2019-08-08 stsp goto done;
4149 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4150 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
4152 33aa809d 2019-08-08 stsp goto done;
4154 33aa809d 2019-08-08 stsp switch (*choice) {
4155 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4156 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4157 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4159 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4160 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4161 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4163 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4166 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4170 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4171 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4172 33aa809d 2019-08-08 stsp return err;
4175 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4176 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4177 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4178 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4179 1f1abb7e 2019-08-08 stsp void *progress_arg;
4180 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4181 33aa809d 2019-08-08 stsp void *patch_arg;
4182 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4185 e20a8b6f 2019-06-04 stsp static const struct got_error *
4186 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4187 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4188 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4189 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4190 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4192 33aa809d 2019-08-08 stsp const struct got_error *err;
4193 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4194 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4195 1ebedb77 2019-10-19 stsp int fd2 = -1;
4196 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4197 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4198 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4199 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
4200 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
4201 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
4202 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
4203 33aa809d 2019-08-08 stsp struct got_diff_change *change;
4204 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
4205 33aa809d 2019-08-08 stsp int n = 0;
4207 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4209 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4211 33aa809d 2019-08-08 stsp return err;
4213 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4214 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4215 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4216 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4217 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4218 fa3cef63 2020-07-23 stsp goto done;
4220 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4221 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4222 fa3cef63 2020-07-23 stsp if (link_len == -1)
4223 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4224 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4225 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4228 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4229 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4230 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4231 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4232 fa3cef63 2020-07-23 stsp goto done;
4234 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4235 fa3cef63 2020-07-23 stsp sizeof(link_target));
4236 fa3cef63 2020-07-23 stsp if (link_len == -1)
4237 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4238 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4239 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4242 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4243 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4244 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4245 fa3cef63 2020-07-23 stsp goto done;
4248 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4249 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4250 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4251 fa3cef63 2020-07-23 stsp goto done;
4256 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4257 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4258 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4259 fa3cef63 2020-07-23 stsp goto done;
4261 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4262 fa3cef63 2020-07-23 stsp if (n != link_len) {
4263 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4264 fa3cef63 2020-07-23 stsp goto done;
4266 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4267 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4268 fa3cef63 2020-07-23 stsp goto done;
4270 fa3cef63 2020-07-23 stsp rewind(f2);
4273 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4275 33aa809d 2019-08-08 stsp goto done;
4277 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4279 33aa809d 2019-08-08 stsp goto done;
4281 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4283 33aa809d 2019-08-08 stsp goto done;
4285 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
4286 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
4287 33aa809d 2019-08-08 stsp goto done;
4290 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
4291 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
4293 33aa809d 2019-08-08 stsp goto done;
4295 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4297 33aa809d 2019-08-08 stsp goto done;
4299 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4300 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4301 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4302 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4303 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
4304 33aa809d 2019-08-08 stsp int choice;
4305 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
4306 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
4307 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
4308 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4309 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4310 e635744c 2019-08-08 stsp patch_cb, patch_arg);
4312 33aa809d 2019-08-08 stsp goto done;
4313 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4314 33aa809d 2019-08-08 stsp have_content = 1;
4315 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4318 1ebedb77 2019-10-19 stsp if (have_content) {
4319 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4320 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4321 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4323 1ebedb77 2019-10-19 stsp goto done;
4325 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4326 fa3cef63 2020-07-23 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
4327 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("chmod", path2);
4328 fa3cef63 2020-07-23 stsp goto done;
4333 33aa809d 2019-08-08 stsp free(id_str);
4335 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4336 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4337 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4338 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4339 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4340 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4341 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4342 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4343 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4344 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4345 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4346 33aa809d 2019-08-08 stsp if (err || !have_content) {
4347 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4348 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4349 33aa809d 2019-08-08 stsp free(*path_outfile);
4350 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4352 33aa809d 2019-08-08 stsp free(args);
4354 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
4357 33aa809d 2019-08-08 stsp if (changes)
4358 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
4359 33aa809d 2019-08-08 stsp free(path1);
4360 33aa809d 2019-08-08 stsp return err;
4363 33aa809d 2019-08-08 stsp static const struct got_error *
4364 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4365 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4366 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4367 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4369 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4370 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4371 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4372 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4373 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4374 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4375 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4376 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4377 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4378 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4380 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4381 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4382 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4383 d3bcc3d1 2019-08-08 stsp return NULL;
4385 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4386 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4387 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4389 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4390 65084dad 2019-08-08 stsp if (ie == NULL)
4391 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4393 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4394 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4395 a129376b 2019-03-28 stsp if (err) {
4396 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4397 a129376b 2019-03-28 stsp goto done;
4398 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4399 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4400 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4401 e20a8b6f 2019-06-04 stsp goto done;
4404 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4405 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4406 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4407 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4408 a129376b 2019-03-28 stsp goto done;
4411 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4412 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4413 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4414 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4415 a129376b 2019-03-28 stsp goto done;
4418 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4419 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4420 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4421 a129376b 2019-03-28 stsp goto done;
4426 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4427 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4428 a9fa2909 2019-07-27 stsp if (err) {
4429 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4430 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4431 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4432 a9fa2909 2019-07-27 stsp goto done;
4434 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4436 a9fa2909 2019-07-27 stsp goto done;
4438 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4440 a9fa2909 2019-07-27 stsp goto done;
4442 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4443 1233e6b6 2020-10-19 stsp free(te_name);
4444 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4445 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4446 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4447 a9fa2909 2019-07-27 stsp goto done;
4451 a129376b 2019-03-28 stsp switch (status) {
4452 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4453 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4454 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4455 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4456 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4458 33aa809d 2019-08-08 stsp goto done;
4459 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4462 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4463 1f1abb7e 2019-08-08 stsp ie->path);
4465 1ee397ad 2019-07-12 stsp goto done;
4466 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4468 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4469 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4470 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4471 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4472 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4474 33aa809d 2019-08-08 stsp goto done;
4475 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4478 33aa809d 2019-08-08 stsp /* fall through */
4479 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4480 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4481 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4482 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4483 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4484 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4485 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4486 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4487 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4489 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4490 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4491 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4493 65084dad 2019-08-08 stsp goto done;
4495 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4496 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4497 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4498 a129376b 2019-03-28 stsp goto done;
4501 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4502 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4503 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4504 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4505 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4506 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4507 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4509 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4510 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4511 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4512 369fd7e5 2020-07-23 stsp path_content);
4515 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4516 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4517 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4518 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4520 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4521 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4522 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4523 369fd7e5 2020-07-23 stsp goto done;
4527 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4528 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4529 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4530 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4531 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4532 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4534 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4536 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4537 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4538 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4539 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4542 a129376b 2019-03-28 stsp goto done;
4543 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4544 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4545 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4546 054041d0 2020-06-24 stsp ondisk_path, blob->id.sha1,
4547 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4549 2e1fa222 2020-07-23 stsp goto done;
4551 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4552 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4553 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4562 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4563 33aa809d 2019-08-08 stsp free(path_content);
4564 e20a8b6f 2019-06-04 stsp free(parent_path);
4565 a129376b 2019-03-28 stsp free(tree_path);
4567 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4569 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4570 a129376b 2019-03-28 stsp free(tree_id);
4571 e20a8b6f 2019-06-04 stsp return err;
4574 e20a8b6f 2019-06-04 stsp const struct got_error *
4575 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4576 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4577 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4578 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4579 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4581 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4582 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4583 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4584 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4585 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4586 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4588 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4590 e20a8b6f 2019-06-04 stsp return err;
4592 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4594 e20a8b6f 2019-06-04 stsp goto done;
4596 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4597 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4598 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4599 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4600 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4601 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4602 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4603 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4604 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4605 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4609 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4610 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4611 e20a8b6f 2019-06-04 stsp err = sync_err;
4613 fb399478 2019-07-12 stsp free(fileindex_path);
4614 a129376b 2019-03-28 stsp if (fileindex)
4615 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4616 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4617 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4618 a129376b 2019-03-28 stsp err = unlockerr;
4619 c4296144 2019-05-09 stsp return err;
4622 cf066bf8 2019-05-09 stsp static void
4623 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4625 24519714 2019-05-09 stsp free(ct->path);
4626 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4627 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4628 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4629 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4630 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4631 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4635 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4636 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4637 24519714 2019-05-09 stsp struct got_repository *repo;
4638 24519714 2019-05-09 stsp struct got_worktree *worktree;
4639 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4640 5f8a88c6 2019-08-03 stsp int have_staged_files;
4641 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4644 c4296144 2019-05-09 stsp static const struct got_error *
4645 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4646 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4647 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4648 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4650 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4651 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4652 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4653 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4654 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4655 768aea60 2019-05-09 stsp struct stat sb;
4657 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4658 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4659 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4660 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4661 5f8a88c6 2019-08-03 stsp return NULL;
4663 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4664 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4666 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4667 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4668 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4669 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4670 5f8a88c6 2019-08-03 stsp return NULL;
4673 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4674 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4675 036813ee 2019-05-09 stsp goto done;
4677 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4678 036813ee 2019-05-09 stsp parent_path = strdup("");
4679 69960a46 2019-05-09 stsp if (parent_path == NULL)
4680 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4682 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4684 69960a46 2019-05-09 stsp return err;
4687 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4688 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4689 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4690 c4296144 2019-05-09 stsp goto done;
4693 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4694 768aea60 2019-05-09 stsp relpath) == -1) {
4695 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4696 768aea60 2019-05-09 stsp goto done;
4699 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4700 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4701 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4702 0aeb8099 2020-07-23 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4703 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4704 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4705 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4706 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4708 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4709 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4712 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4713 0aeb8099 2020-07-23 stsp goto done;
4715 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4716 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4717 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4718 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4719 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4720 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4721 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4722 12463d8b 2019-12-13 stsp ct->ondisk_path);
4723 12463d8b 2019-12-13 stsp goto done;
4725 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4726 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4727 768aea60 2019-05-09 stsp goto done;
4729 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4732 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4733 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4734 44d03001 2019-05-09 stsp relpath) == -1) {
4735 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4736 44d03001 2019-05-09 stsp goto done;
4739 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4740 35213c7c 2020-07-23 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4741 35213c7c 2020-07-23 stsp int is_bad_symlink;
4742 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4743 35213c7c 2020-07-23 stsp ssize_t target_len;
4744 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4745 35213c7c 2020-07-23 stsp sizeof(target_path));
4746 35213c7c 2020-07-23 stsp if (target_len == -1) {
4747 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4748 35213c7c 2020-07-23 stsp ct->ondisk_path);
4749 35213c7c 2020-07-23 stsp goto done;
4751 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4752 35213c7c 2020-07-23 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4754 35213c7c 2020-07-23 stsp goto done;
4755 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4756 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4757 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4758 35213c7c 2020-07-23 stsp goto done;
4763 cf066bf8 2019-05-09 stsp ct->status = status;
4764 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4765 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4766 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4767 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4768 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4769 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4770 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4771 b416585c 2019-05-13 stsp goto done;
4773 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4774 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4775 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4776 f0b75401 2019-08-03 stsp goto done;
4779 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4780 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4781 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4782 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4783 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4784 036813ee 2019-05-09 stsp goto done;
4787 24519714 2019-05-09 stsp ct->path = strdup(path);
4788 24519714 2019-05-09 stsp if (ct->path == NULL) {
4789 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4790 24519714 2019-05-09 stsp goto done;
4792 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4794 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4795 ed175427 2019-05-09 stsp free_commitable(ct);
4796 24519714 2019-05-09 stsp free(parent_path);
4797 036813ee 2019-05-09 stsp free(path);
4798 a129376b 2019-03-28 stsp return err;
4801 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4802 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4803 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4804 036813ee 2019-05-09 stsp struct got_repository *);
4806 ed175427 2019-05-09 stsp static const struct got_error *
4807 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4808 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4809 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4810 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4811 afa376bf 2019-05-09 stsp struct got_repository *repo)
4813 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4814 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4815 036813ee 2019-05-09 stsp char *subpath;
4817 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4818 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4819 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4821 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4823 ed175427 2019-05-09 stsp return err;
4825 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4826 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4827 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4828 036813ee 2019-05-09 stsp free(subpath);
4829 036813ee 2019-05-09 stsp return err;
4832 036813ee 2019-05-09 stsp static const struct got_error *
4833 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4835 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4836 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4838 036813ee 2019-05-09 stsp *match = 0;
4840 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4841 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4842 0f63689d 2019-05-10 stsp return NULL;
4845 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4847 0f63689d 2019-05-10 stsp return err;
4848 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4849 036813ee 2019-05-09 stsp free(ct_parent_path);
4850 036813ee 2019-05-09 stsp return err;
4853 768aea60 2019-05-09 stsp static mode_t
4854 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4856 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
4857 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
4859 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4862 036813ee 2019-05-09 stsp static const struct got_error *
4863 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4864 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4866 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4868 036813ee 2019-05-09 stsp *new_te = NULL;
4870 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4872 036813ee 2019-05-09 stsp goto done;
4874 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4876 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4877 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4878 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4880 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4882 036813ee 2019-05-09 stsp if (err && *new_te) {
4883 56e0773d 2019-11-28 stsp free(*new_te);
4884 036813ee 2019-05-09 stsp *new_te = NULL;
4886 036813ee 2019-05-09 stsp return err;
4889 036813ee 2019-05-09 stsp static const struct got_error *
4890 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4891 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4893 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4894 102b254e 2020-10-19 stsp char *ct_name = NULL;
4896 036813ee 2019-05-09 stsp *new_te = NULL;
4898 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4899 036813ee 2019-05-09 stsp if (*new_te == NULL)
4900 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4902 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
4904 036813ee 2019-05-09 stsp goto done;
4905 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4906 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4907 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4908 036813ee 2019-05-09 stsp goto done;
4911 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4913 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4914 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4915 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4917 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4919 102b254e 2020-10-19 stsp free(ct_name);
4920 036813ee 2019-05-09 stsp if (err && *new_te) {
4921 56e0773d 2019-11-28 stsp free(*new_te);
4922 036813ee 2019-05-09 stsp *new_te = NULL;
4924 036813ee 2019-05-09 stsp return err;
4927 036813ee 2019-05-09 stsp static const struct got_error *
4928 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
4929 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
4931 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4932 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
4934 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4936 036813ee 2019-05-09 stsp return err;
4937 036813ee 2019-05-09 stsp if (new_pe == NULL)
4938 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
4939 036813ee 2019-05-09 stsp return NULL;
4942 afa376bf 2019-05-09 stsp static const struct got_error *
4943 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
4944 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
4946 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
4947 5f8a88c6 2019-08-03 stsp unsigned char status;
4949 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
4950 afa376bf 2019-05-09 stsp ct_path++;
4952 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4953 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
4955 5f8a88c6 2019-08-03 stsp status = ct->status;
4957 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4958 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4961 036813ee 2019-05-09 stsp static const struct got_error *
4962 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4963 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4965 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4966 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4967 44d03001 2019-05-09 stsp char *te_path;
4969 44d03001 2019-05-09 stsp *modified = 0;
4971 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4972 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4973 44d03001 2019-05-09 stsp te->name) == -1)
4974 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4976 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4977 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4978 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4979 44d03001 2019-05-09 stsp strlen(te_path));
4980 44d03001 2019-05-09 stsp if (*modified)
4984 44d03001 2019-05-09 stsp free(te_path);
4985 44d03001 2019-05-09 stsp return err;
4988 44d03001 2019-05-09 stsp static const struct got_error *
4989 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4990 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4991 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4993 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4994 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4996 036813ee 2019-05-09 stsp *ctp = NULL;
4998 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4999 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5000 036813ee 2019-05-09 stsp char *ct_name = NULL;
5001 036813ee 2019-05-09 stsp int path_matches;
5003 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5004 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5005 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5006 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5009 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5010 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5014 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5017 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5019 036813ee 2019-05-09 stsp return err;
5020 036813ee 2019-05-09 stsp if (!path_matches)
5023 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5025 d34b633e 2020-10-19 stsp return err;
5027 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5028 d34b633e 2020-10-19 stsp free(ct_name);
5031 d34b633e 2020-10-19 stsp free(ct_name);
5033 036813ee 2019-05-09 stsp *ctp = ct;
5037 2b496619 2019-07-10 stsp return err;
5040 2b496619 2019-07-10 stsp static const struct got_error *
5041 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5042 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5043 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5044 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5045 2b496619 2019-07-10 stsp struct got_repository *repo)
5047 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5048 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5049 2b496619 2019-07-10 stsp char *subtree_path;
5050 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5051 ba580f68 2020-03-22 stsp int nentries;
5053 2b496619 2019-07-10 stsp *new_tep = NULL;
5055 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5056 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5057 2b496619 2019-07-10 stsp child_path) == -1)
5058 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5060 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5061 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5062 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5063 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5065 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5066 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5067 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5068 2b496619 2019-07-10 stsp goto done;
5070 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5071 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5072 2b496619 2019-07-10 stsp if (err) {
5073 56e0773d 2019-11-28 stsp free(new_te);
5074 2b496619 2019-07-10 stsp goto done;
5076 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5079 2b496619 2019-07-10 stsp free(subtree_path);
5080 2b496619 2019-07-10 stsp if (err == NULL)
5081 2b496619 2019-07-10 stsp *new_tep = new_te;
5082 036813ee 2019-05-09 stsp return err;
5085 036813ee 2019-05-09 stsp static const struct got_error *
5086 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5087 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5088 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5089 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5090 036813ee 2019-05-09 stsp struct got_repository *repo)
5092 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5093 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5094 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5095 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5097 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5098 ba580f68 2020-03-22 stsp *nentries = 0;
5100 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5101 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5102 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5103 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5105 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5106 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5107 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5110 f2b0a8b0 2020-07-31 stsp if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5111 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
5114 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5115 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5117 036813ee 2019-05-09 stsp goto done;
5119 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5120 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5121 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5123 036813ee 2019-05-09 stsp goto done;
5124 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5126 afa376bf 2019-05-09 stsp goto done;
5127 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5128 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5130 2f51b5b3 2019-05-09 stsp goto done;
5131 ba580f68 2020-03-22 stsp (*nentries)++;
5133 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5134 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5135 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5136 2b496619 2019-07-10 stsp == NULL) {
5137 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5138 2b496619 2019-07-10 stsp child_path, path_base_tree,
5139 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5142 2b496619 2019-07-10 stsp goto done;
5143 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5145 2b496619 2019-07-10 stsp goto done;
5146 ba580f68 2020-03-22 stsp (*nentries)++;
5151 2f51b5b3 2019-05-09 stsp if (base_tree) {
5152 56e0773d 2019-11-28 stsp int i, nbase_entries;
5153 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5154 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5155 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5156 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5158 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5159 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5160 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5161 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5163 63c5ca5d 2019-08-24 stsp goto done;
5164 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5166 63c5ca5d 2019-08-24 stsp goto done;
5167 ba580f68 2020-03-22 stsp (*nentries)++;
5171 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5172 44d03001 2019-05-09 stsp int modified;
5173 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5175 036813ee 2019-05-09 stsp goto done;
5176 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5177 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5179 2f51b5b3 2019-05-09 stsp goto done;
5180 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5181 44d03001 2019-05-09 stsp if (modified) {
5182 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5183 ba580f68 2020-03-22 stsp int nsubentries;
5184 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5185 ba580f68 2020-03-22 stsp &nsubentries, te,
5186 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5187 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5189 44d03001 2019-05-09 stsp goto done;
5190 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5191 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5192 ba580f68 2020-03-22 stsp free(new_id);
5195 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5196 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5197 56e0773d 2019-11-28 stsp free(new_id);
5199 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5201 036813ee 2019-05-09 stsp goto done;
5202 ba580f68 2020-03-22 stsp (*nentries)++;
5206 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5207 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5209 f66c734c 2019-09-22 stsp goto done;
5211 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5212 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5213 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5214 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5215 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5216 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5218 2f51b5b3 2019-05-09 stsp goto done;
5219 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5221 2f51b5b3 2019-05-09 stsp goto done;
5222 ba580f68 2020-03-22 stsp (*nentries)++;
5224 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5225 b416585c 2019-05-13 stsp status_arg);
5227 afa376bf 2019-05-09 stsp goto done;
5229 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5230 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5232 2f51b5b3 2019-05-09 stsp goto done;
5233 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5235 2f51b5b3 2019-05-09 stsp goto done;
5236 ba580f68 2020-03-22 stsp (*nentries)++;
5241 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5242 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5244 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5245 2e1fa222 2020-07-23 stsp return err;
5248 2e1fa222 2020-07-23 stsp static const struct got_error *
5249 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
5250 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
5251 72fd46fa 2019-09-06 stsp int have_staged_files)
5253 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5254 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5256 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5257 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5258 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5260 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5262 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5263 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5264 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5265 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5266 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5267 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5268 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5269 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5270 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
5271 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5272 72fd46fa 2019-09-06 stsp !have_staged_files);
5274 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5275 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
5276 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5277 72fd46fa 2019-09-06 stsp !have_staged_files);
5279 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5282 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
5283 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
5284 3969253a 2020-03-07 stsp if (err) {
5285 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5288 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5289 3969253a 2020-03-07 stsp if (err) {
5290 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5295 d56d26ce 2019-05-10 stsp return err;
5299 d56d26ce 2019-05-10 stsp static const struct got_error *
5300 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5301 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5302 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5303 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5304 735ef5ac 2019-08-03 stsp int ood_errcode)
5306 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5307 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5309 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5310 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5311 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5312 1a36436d 2019-06-10 stsp return NULL;
5314 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5315 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5317 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5318 735ef5ac 2019-08-03 stsp in_repo_path);
5319 9bead371 2019-07-28 stsp if (err) {
5320 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5321 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5322 1a36436d 2019-06-10 stsp goto done;
5323 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5324 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5326 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5327 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5328 735ef5ac 2019-08-03 stsp in_repo_path);
5329 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5330 1a36436d 2019-06-10 stsp goto done;
5331 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5335 1a36436d 2019-06-10 stsp return err;
5338 c4296144 2019-05-09 stsp const struct got_error *
5339 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5340 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5341 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5342 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5343 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5344 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5345 afa376bf 2019-05-09 stsp struct got_repository *repo)
5347 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5348 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5349 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5350 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5351 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5352 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5353 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5354 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5355 ba580f68 2020-03-22 stsp int nentries;
5356 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5357 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5358 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5360 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5362 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
5364 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5366 588edf97 2019-05-10 stsp goto done;
5368 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5370 588edf97 2019-05-10 stsp goto done;
5372 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5373 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5378 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5379 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5383 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5384 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5385 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5386 cf066bf8 2019-05-09 stsp char *ondisk_path;
5388 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5389 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5390 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5393 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5394 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5395 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5398 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5399 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5400 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5401 cf066bf8 2019-05-09 stsp goto done;
5403 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5404 2e1fa222 2020-07-23 stsp free(ondisk_path);
5406 cf066bf8 2019-05-09 stsp goto done;
5409 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5410 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5411 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5413 036813ee 2019-05-09 stsp goto done;
5415 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5417 de18fc63 2019-05-09 stsp goto done;
5418 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5419 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5420 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5421 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5422 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5423 33ad4cbe 2019-05-12 jcs free(logmsg);
5425 9d40349a 2019-05-09 stsp goto done;
5427 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5428 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5429 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5430 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5431 09f5bd90 2019-05-09 stsp goto done;
5433 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5434 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5436 09f5bd90 2019-05-09 stsp goto done;
5437 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5439 ebf99748 2019-05-09 stsp goto done;
5440 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5441 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5442 09f5bd90 2019-05-09 stsp goto done;
5444 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5445 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5447 f2c16586 2019-05-09 stsp goto done;
5448 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5450 f2c16586 2019-05-09 stsp goto done;
5452 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5454 09f5bd90 2019-05-09 stsp goto done;
5456 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5458 ebf99748 2019-05-09 stsp goto done;
5460 588edf97 2019-05-10 stsp if (head_tree)
5461 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5462 588edf97 2019-05-10 stsp if (head_commit)
5463 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5464 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5465 2f17228e 2019-05-12 stsp if (head_ref2) {
5466 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5467 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5468 2f17228e 2019-05-12 stsp err = unlockerr;
5469 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5471 39cd0ff6 2019-07-12 stsp return err;
5474 5c1e53bc 2019-07-28 stsp static const struct got_error *
5475 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5476 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5478 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5479 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5481 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5482 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5483 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5485 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5486 5c1e53bc 2019-07-28 stsp ct_path++;
5488 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5489 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5493 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5494 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5496 5c1e53bc 2019-07-28 stsp return NULL;
5499 f0b75401 2019-08-03 stsp static const struct got_error *
5500 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5502 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5504 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5505 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5506 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5509 f0b75401 2019-08-03 stsp return NULL;
5512 5f8a88c6 2019-08-03 stsp static const struct got_error *
5513 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5514 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5516 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5517 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5519 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5520 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5522 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5523 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5524 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5525 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5526 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5527 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5530 5f8a88c6 2019-08-03 stsp return NULL;
5533 39cd0ff6 2019-07-12 stsp const struct got_error *
5534 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5535 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5536 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5537 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5538 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5539 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5541 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5542 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5543 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5544 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5545 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5546 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5547 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5548 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5549 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5551 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5553 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5555 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5557 39cd0ff6 2019-07-12 stsp goto done;
5559 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5561 39cd0ff6 2019-07-12 stsp goto done;
5563 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5565 39cd0ff6 2019-07-12 stsp goto done;
5567 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5569 39cd0ff6 2019-07-12 stsp goto done;
5571 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5572 5f8a88c6 2019-08-03 stsp &have_staged_files);
5573 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5574 5f8a88c6 2019-08-03 stsp goto done;
5575 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5576 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5578 5f8a88c6 2019-08-03 stsp goto done;
5581 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5582 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5583 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5584 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5585 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5586 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5587 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5588 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5589 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5591 5c1e53bc 2019-07-28 stsp goto done;
5594 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5595 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5596 39cd0ff6 2019-07-12 stsp goto done;
5599 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5600 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5602 5c1e53bc 2019-07-28 stsp goto done;
5605 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5606 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5607 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5609 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5610 f0b75401 2019-08-03 stsp ct_path++;
5611 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5612 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5613 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5615 b50cabdf 2019-07-12 stsp goto done;
5619 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5620 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5621 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5623 39cd0ff6 2019-07-12 stsp goto done;
5625 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5626 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
5627 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5628 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5629 39cd0ff6 2019-07-12 stsp err = sync_err;
5631 39cd0ff6 2019-07-12 stsp if (fileindex)
5632 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5633 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5634 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5635 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5636 39cd0ff6 2019-07-12 stsp err = unlockerr;
5637 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5638 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5639 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5641 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5642 c4296144 2019-05-09 stsp return err;
5645 8656d6c4 2019-05-20 stsp const char *
5646 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5648 8656d6c4 2019-05-20 stsp return ct->path;
5651 8656d6c4 2019-05-20 stsp unsigned int
5652 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5654 8656d6c4 2019-05-20 stsp return ct->status;
5657 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5658 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5659 818c7501 2019-07-11 stsp struct got_repository *repo;
5662 818c7501 2019-07-11 stsp static const struct got_error *
5663 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5665 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5666 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5667 818c7501 2019-07-11 stsp unsigned char status;
5668 818c7501 2019-07-11 stsp struct stat sb;
5669 818c7501 2019-07-11 stsp char *ondisk_path;
5671 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5672 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5673 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5674 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5676 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5678 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5680 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5681 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5682 818c7501 2019-07-11 stsp free(ondisk_path);
5684 818c7501 2019-07-11 stsp return err;
5686 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5687 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5688 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5689 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5691 818c7501 2019-07-11 stsp return NULL;
5694 818c7501 2019-07-11 stsp const struct got_error *
5695 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5696 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5697 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5698 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5700 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5701 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5702 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5703 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5704 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5705 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5706 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5708 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5709 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5710 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5712 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5714 818c7501 2019-07-11 stsp return err;
5716 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5718 818c7501 2019-07-11 stsp goto done;
5720 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5721 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5722 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5725 818c7501 2019-07-11 stsp goto done;
5727 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5729 818c7501 2019-07-11 stsp goto done;
5731 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5733 818c7501 2019-07-11 stsp goto done;
5735 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5737 818c7501 2019-07-11 stsp goto done;
5739 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5742 e51d7b55 2020-01-04 stsp goto done;
5744 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5746 818c7501 2019-07-11 stsp goto done;
5747 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5748 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5749 e51d7b55 2020-01-04 stsp goto done;
5752 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5753 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5755 818c7501 2019-07-11 stsp goto done;
5756 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5758 818c7501 2019-07-11 stsp goto done;
5760 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5762 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5764 818c7501 2019-07-11 stsp goto done;
5766 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5768 818c7501 2019-07-11 stsp goto done;
5770 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5771 818c7501 2019-07-11 stsp worktree->base_commit_id);
5773 818c7501 2019-07-11 stsp goto done;
5774 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5776 818c7501 2019-07-11 stsp goto done;
5778 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5780 818c7501 2019-07-11 stsp goto done;
5782 818c7501 2019-07-11 stsp free(fileindex_path);
5783 818c7501 2019-07-11 stsp free(tmp_branch_name);
5784 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5785 818c7501 2019-07-11 stsp free(branch_ref_name);
5786 818c7501 2019-07-11 stsp if (branch_ref)
5787 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5788 818c7501 2019-07-11 stsp if (wt_branch)
5789 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5790 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5791 818c7501 2019-07-11 stsp if (err) {
5792 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5793 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5794 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5796 818c7501 2019-07-11 stsp if (*tmp_branch) {
5797 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5798 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5800 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5801 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5802 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5804 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5806 818c7501 2019-07-11 stsp return err;
5809 818c7501 2019-07-11 stsp const struct got_error *
5810 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5811 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5812 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5813 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5815 818c7501 2019-07-11 stsp const struct got_error *err;
5816 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5817 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5818 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5819 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5820 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5822 818c7501 2019-07-11 stsp *commit_id = NULL;
5823 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5824 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5825 3e3a69f1 2019-07-25 stsp *branch = NULL;
5826 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5828 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5830 3e3a69f1 2019-07-25 stsp return err;
5832 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5834 f032f1f7 2019-08-04 stsp goto done;
5836 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5837 f032f1f7 2019-08-04 stsp &have_staged_files);
5838 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5839 f032f1f7 2019-08-04 stsp goto done;
5840 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5841 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5842 3e3a69f1 2019-07-25 stsp goto done;
5845 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5847 f032f1f7 2019-08-04 stsp goto done;
5849 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5851 818c7501 2019-07-11 stsp goto done;
5853 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5855 818c7501 2019-07-11 stsp goto done;
5857 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5859 818c7501 2019-07-11 stsp goto done;
5861 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5863 818c7501 2019-07-11 stsp goto done;
5865 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5866 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5868 818c7501 2019-07-11 stsp goto done;
5870 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5872 818c7501 2019-07-11 stsp goto done;
5874 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5876 818c7501 2019-07-11 stsp goto done;
5878 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5879 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5881 818c7501 2019-07-11 stsp goto done;
5883 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5885 818c7501 2019-07-11 stsp goto done;
5887 818c7501 2019-07-11 stsp free(commit_ref_name);
5888 818c7501 2019-07-11 stsp free(branch_ref_name);
5889 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5890 818c7501 2019-07-11 stsp if (commit_ref)
5891 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5892 818c7501 2019-07-11 stsp if (branch_ref)
5893 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5894 818c7501 2019-07-11 stsp if (err) {
5895 818c7501 2019-07-11 stsp free(*commit_id);
5896 818c7501 2019-07-11 stsp *commit_id = NULL;
5897 818c7501 2019-07-11 stsp if (*tmp_branch) {
5898 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5899 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5901 818c7501 2019-07-11 stsp if (*new_base_branch) {
5902 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5903 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5905 818c7501 2019-07-11 stsp if (*branch) {
5906 818c7501 2019-07-11 stsp got_ref_close(*branch);
5907 818c7501 2019-07-11 stsp *branch = NULL;
5909 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5910 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5911 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5913 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
5915 818c7501 2019-07-11 stsp return err;
5918 818c7501 2019-07-11 stsp const struct got_error *
5919 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5921 818c7501 2019-07-11 stsp const struct got_error *err;
5922 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
5924 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5926 818c7501 2019-07-11 stsp return err;
5928 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5929 818c7501 2019-07-11 stsp free(tmp_branch_name);
5930 818c7501 2019-07-11 stsp return NULL;
5933 818c7501 2019-07-11 stsp static const struct got_error *
5934 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5935 818c7501 2019-07-11 stsp char **logmsg, void *arg)
5937 0ebf8283 2019-07-24 stsp *logmsg = arg;
5938 818c7501 2019-07-11 stsp return NULL;
5941 818c7501 2019-07-11 stsp static const struct got_error *
5942 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5943 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5944 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5945 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5947 818c7501 2019-07-11 stsp return NULL;
5950 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
5951 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
5952 01757395 2019-07-12 stsp void *progress_arg;
5953 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
5956 01757395 2019-07-12 stsp static const struct got_error *
5957 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
5959 01757395 2019-07-12 stsp const struct got_error *err;
5960 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5962 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5964 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5966 01757395 2019-07-12 stsp return err;
5968 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5969 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5970 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5971 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5972 01757395 2019-07-12 stsp return NULL;
5974 01757395 2019-07-12 stsp p = strdup(path);
5975 01757395 2019-07-12 stsp if (p == NULL)
5976 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5978 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5979 01757395 2019-07-12 stsp if (err || new == NULL)
5981 01757395 2019-07-12 stsp return err;
5985 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5987 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5989 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5990 01757395 2019-07-12 stsp free((char *)pe->path);
5992 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
5995 0ebf8283 2019-07-24 stsp static const struct got_error *
5996 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5997 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
5999 818c7501 2019-07-11 stsp const struct got_error *err;
6000 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6002 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6003 818c7501 2019-07-11 stsp if (err) {
6004 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6005 818c7501 2019-07-11 stsp goto done;
6006 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6008 818c7501 2019-07-11 stsp goto done;
6009 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6011 818c7501 2019-07-11 stsp goto done;
6012 de05890f 2020-03-05 stsp } else if (is_rebase) {
6013 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6016 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6018 818c7501 2019-07-11 stsp goto done;
6019 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6020 818c7501 2019-07-11 stsp free(stored_id);
6021 818c7501 2019-07-11 stsp if (cmp != 0) {
6022 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6023 818c7501 2019-07-11 stsp goto done;
6027 0ebf8283 2019-07-24 stsp if (commit_ref)
6028 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6029 0ebf8283 2019-07-24 stsp return err;
6032 0ebf8283 2019-07-24 stsp static const struct got_error *
6033 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6034 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6035 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6036 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6037 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6038 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6040 0ebf8283 2019-07-24 stsp const struct got_error *err;
6041 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6042 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6043 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6045 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6047 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6049 0ebf8283 2019-07-24 stsp return err;
6051 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6052 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6053 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6054 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6055 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6056 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6057 818c7501 2019-07-11 stsp if (commit_ref)
6058 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6059 818c7501 2019-07-11 stsp return err;
6062 818c7501 2019-07-11 stsp const struct got_error *
6063 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6064 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6065 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6066 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6067 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6068 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6070 0ebf8283 2019-07-24 stsp const struct got_error *err;
6071 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6073 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6075 0ebf8283 2019-07-24 stsp return err;
6077 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6079 0ebf8283 2019-07-24 stsp goto done;
6081 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6082 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6083 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6085 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6086 0ebf8283 2019-07-24 stsp return err;
6089 0ebf8283 2019-07-24 stsp const struct got_error *
6090 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6091 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6092 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6093 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6094 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6095 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6097 0ebf8283 2019-07-24 stsp const struct got_error *err;
6098 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6100 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6102 0ebf8283 2019-07-24 stsp return err;
6104 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6106 0ebf8283 2019-07-24 stsp goto done;
6108 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6109 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6110 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6112 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6113 0ebf8283 2019-07-24 stsp return err;
6116 0ebf8283 2019-07-24 stsp static const struct got_error *
6117 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6118 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6119 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6120 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6121 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6123 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6124 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6125 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6126 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6127 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6128 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6129 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6131 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6132 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6134 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6136 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6138 3e3a69f1 2019-07-25 stsp return err;
6140 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6141 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6142 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6143 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6145 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6146 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6147 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6148 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6150 01757395 2019-07-12 stsp if (merged_paths) {
6151 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6152 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6153 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6154 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6157 01757395 2019-07-12 stsp goto done;
6160 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6161 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6163 01757395 2019-07-12 stsp goto done;
6166 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6167 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6168 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6170 a0e95631 2019-07-12 stsp goto done;
6171 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6172 a0e95631 2019-07-12 stsp goto done;
6175 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6177 edd02c5e 2019-07-11 stsp goto done;
6179 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6181 818c7501 2019-07-11 stsp goto done;
6183 5943eee2 2019-08-13 stsp if (new_logmsg) {
6184 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6185 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6186 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6187 5943eee2 2019-08-13 stsp goto done;
6190 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6192 5943eee2 2019-08-13 stsp goto done;
6195 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6196 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6197 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6198 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6199 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6201 a0e95631 2019-07-12 stsp goto done;
6203 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6205 a0e95631 2019-07-12 stsp goto done;
6207 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6209 a0e95631 2019-07-12 stsp goto done;
6211 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
6212 72fd46fa 2019-09-06 stsp fileindex, 0);
6213 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6214 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6215 a0e95631 2019-07-12 stsp err = sync_err;
6217 a0e95631 2019-07-12 stsp free(fileindex_path);
6218 a0e95631 2019-07-12 stsp free(head_commit_id);
6219 a0e95631 2019-07-12 stsp if (head_ref)
6220 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6221 818c7501 2019-07-11 stsp if (err) {
6222 818c7501 2019-07-11 stsp free(*new_commit_id);
6223 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6225 818c7501 2019-07-11 stsp return err;
6228 818c7501 2019-07-11 stsp const struct got_error *
6229 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6230 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6231 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6232 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6233 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6235 0ebf8283 2019-07-24 stsp const struct got_error *err;
6236 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6237 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6238 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6240 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6242 0ebf8283 2019-07-24 stsp return err;
6244 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6246 0ebf8283 2019-07-24 stsp goto done;
6247 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6249 0ebf8283 2019-07-24 stsp goto done;
6250 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6251 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6252 0ebf8283 2019-07-24 stsp goto done;
6255 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6256 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6258 0ebf8283 2019-07-24 stsp if (commit_ref)
6259 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6260 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6261 0ebf8283 2019-07-24 stsp free(commit_id);
6262 0ebf8283 2019-07-24 stsp return err;
6265 0ebf8283 2019-07-24 stsp const struct got_error *
6266 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6267 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6268 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6269 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6270 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6271 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6273 0ebf8283 2019-07-24 stsp const struct got_error *err;
6274 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6275 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6277 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6279 0ebf8283 2019-07-24 stsp return err;
6281 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6283 0ebf8283 2019-07-24 stsp goto done;
6285 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6286 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6288 0ebf8283 2019-07-24 stsp if (commit_ref)
6289 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6290 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6291 0ebf8283 2019-07-24 stsp return err;
6294 0ebf8283 2019-07-24 stsp const struct got_error *
6295 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6296 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6298 3e3a69f1 2019-07-25 stsp if (fileindex)
6299 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6300 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6303 69844fba 2019-07-11 stsp static const struct got_error *
6304 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6306 69844fba 2019-07-11 stsp const struct got_error *err;
6307 69844fba 2019-07-11 stsp struct got_reference *ref;
6309 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6310 69844fba 2019-07-11 stsp if (err) {
6311 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6312 69844fba 2019-07-11 stsp return NULL;
6313 69844fba 2019-07-11 stsp return err;
6316 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6317 69844fba 2019-07-11 stsp got_ref_close(ref);
6318 69844fba 2019-07-11 stsp return err;
6321 69844fba 2019-07-11 stsp static const struct got_error *
6322 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6324 69844fba 2019-07-11 stsp const struct got_error *err;
6325 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6326 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6328 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6330 69844fba 2019-07-11 stsp goto done;
6331 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6333 69844fba 2019-07-11 stsp goto done;
6335 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6337 69844fba 2019-07-11 stsp goto done;
6338 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6340 69844fba 2019-07-11 stsp goto done;
6342 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6344 69844fba 2019-07-11 stsp goto done;
6345 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6347 69844fba 2019-07-11 stsp goto done;
6349 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6351 69844fba 2019-07-11 stsp goto done;
6352 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6354 69844fba 2019-07-11 stsp goto done;
6357 69844fba 2019-07-11 stsp free(tmp_branch_name);
6358 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6359 69844fba 2019-07-11 stsp free(branch_ref_name);
6360 69844fba 2019-07-11 stsp free(commit_ref_name);
6361 69844fba 2019-07-11 stsp return err;
6364 818c7501 2019-07-11 stsp const struct got_error *
6365 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6366 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6367 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6368 818c7501 2019-07-11 stsp struct got_repository *repo)
6370 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
6371 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6373 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6375 818c7501 2019-07-11 stsp return err;
6377 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6379 818c7501 2019-07-11 stsp goto done;
6381 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6383 818c7501 2019-07-11 stsp goto done;
6385 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6387 818c7501 2019-07-11 stsp goto done;
6389 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6391 3e3a69f1 2019-07-25 stsp if (fileindex)
6392 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6393 818c7501 2019-07-11 stsp free(new_head_commit_id);
6394 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6395 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6396 818c7501 2019-07-11 stsp err = unlockerr;
6397 818c7501 2019-07-11 stsp return err;
6400 818c7501 2019-07-11 stsp const struct got_error *
6401 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6402 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6403 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6404 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6406 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6407 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6408 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6409 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6410 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6411 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6413 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6415 818c7501 2019-07-11 stsp return err;
6417 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6418 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6420 818c7501 2019-07-11 stsp goto done;
6422 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6424 818c7501 2019-07-11 stsp goto done;
6427 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6428 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6429 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6431 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6433 818c7501 2019-07-11 stsp goto done;
6435 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6437 818c7501 2019-07-11 stsp goto done;
6439 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6440 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6442 ca355955 2019-07-12 stsp goto done;
6444 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6446 ca355955 2019-07-12 stsp goto done;
6448 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6450 818c7501 2019-07-11 stsp goto done;
6452 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6453 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6454 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6455 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6456 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6457 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6458 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6459 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6460 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6462 1f1abb7e 2019-08-08 stsp goto sync;
6464 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6465 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6467 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6468 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6469 ca355955 2019-07-12 stsp err = sync_err;
6471 818c7501 2019-07-11 stsp got_ref_close(resolved);
6472 a3a2faf2 2019-07-12 stsp free(tree_id);
6473 818c7501 2019-07-11 stsp free(commit_id);
6474 0ebf8283 2019-07-24 stsp if (fileindex)
6475 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6476 0ebf8283 2019-07-24 stsp free(fileindex_path);
6478 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6479 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6480 0ebf8283 2019-07-24 stsp err = unlockerr;
6481 0ebf8283 2019-07-24 stsp return err;
6484 0ebf8283 2019-07-24 stsp const struct got_error *
6485 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6486 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6487 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6488 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6490 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6491 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6492 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6493 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6494 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6495 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6496 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6497 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6499 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6500 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6501 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6502 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6504 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6506 0ebf8283 2019-07-24 stsp return err;
6508 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6510 0ebf8283 2019-07-24 stsp goto done;
6512 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6513 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6514 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6517 0ebf8283 2019-07-24 stsp goto done;
6519 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6521 0ebf8283 2019-07-24 stsp goto done;
6523 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6525 0ebf8283 2019-07-24 stsp goto done;
6527 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6528 0ebf8283 2019-07-24 stsp worktree);
6530 0ebf8283 2019-07-24 stsp goto done;
6532 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6535 0ebf8283 2019-07-24 stsp goto done;
6537 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6539 0ebf8283 2019-07-24 stsp goto done;
6541 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6543 0ebf8283 2019-07-24 stsp goto done;
6545 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6546 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6548 0ebf8283 2019-07-24 stsp goto done;
6549 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6551 0ebf8283 2019-07-24 stsp goto done;
6552 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6553 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6554 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6555 0ebf8283 2019-07-24 stsp goto done;
6558 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6559 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6561 0ebf8283 2019-07-24 stsp goto done;
6562 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6564 0ebf8283 2019-07-24 stsp goto done;
6566 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6568 0ebf8283 2019-07-24 stsp goto done;
6570 0ebf8283 2019-07-24 stsp free(fileindex_path);
6571 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6572 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6573 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6574 0ebf8283 2019-07-24 stsp if (wt_branch)
6575 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6576 0ebf8283 2019-07-24 stsp if (err) {
6577 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6578 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6579 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6581 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6582 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6583 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6585 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6586 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6587 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6588 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6590 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6592 0ebf8283 2019-07-24 stsp return err;
6595 0ebf8283 2019-07-24 stsp const struct got_error *
6596 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6597 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6599 3e3a69f1 2019-07-25 stsp if (fileindex)
6600 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6601 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6604 0ebf8283 2019-07-24 stsp const struct got_error *
6605 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6606 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6608 0ebf8283 2019-07-24 stsp const struct got_error *err;
6609 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6611 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6613 0ebf8283 2019-07-24 stsp return err;
6615 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6616 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6617 0ebf8283 2019-07-24 stsp return NULL;
6620 0ebf8283 2019-07-24 stsp const struct got_error *
6621 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6622 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6623 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6624 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6626 0ebf8283 2019-07-24 stsp const struct got_error *err;
6627 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6628 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6629 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6630 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6631 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6632 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6634 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6635 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6636 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6637 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6639 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6641 3e3a69f1 2019-07-25 stsp return err;
6643 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6645 f032f1f7 2019-08-04 stsp goto done;
6647 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6648 f032f1f7 2019-08-04 stsp &have_staged_files);
6649 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6650 f032f1f7 2019-08-04 stsp goto done;
6651 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6652 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6653 3e3a69f1 2019-07-25 stsp goto done;
6656 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6658 f032f1f7 2019-08-04 stsp goto done;
6660 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6662 0ebf8283 2019-07-24 stsp goto done;
6664 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6666 0ebf8283 2019-07-24 stsp goto done;
6668 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6669 0ebf8283 2019-07-24 stsp worktree);
6671 0ebf8283 2019-07-24 stsp goto done;
6673 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6675 0ebf8283 2019-07-24 stsp goto done;
6677 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6679 0ebf8283 2019-07-24 stsp goto done;
6680 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6682 0ebf8283 2019-07-24 stsp goto done;
6684 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6686 0ebf8283 2019-07-24 stsp goto done;
6687 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6689 0ebf8283 2019-07-24 stsp goto done;
6691 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6693 0ebf8283 2019-07-24 stsp goto done;
6695 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6696 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6697 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6698 0ebf8283 2019-07-24 stsp if (commit_ref)
6699 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6700 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6701 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6702 0ebf8283 2019-07-24 stsp if (err) {
6703 0ebf8283 2019-07-24 stsp free(*commit_id);
6704 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6705 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6706 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6707 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6708 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6709 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6711 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6712 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6713 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6715 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6717 0ebf8283 2019-07-24 stsp return err;
6720 0ebf8283 2019-07-24 stsp static const struct got_error *
6721 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6723 0ebf8283 2019-07-24 stsp const struct got_error *err;
6724 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6725 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6727 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6729 0ebf8283 2019-07-24 stsp goto done;
6730 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6732 0ebf8283 2019-07-24 stsp goto done;
6734 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6735 0ebf8283 2019-07-24 stsp worktree);
6737 0ebf8283 2019-07-24 stsp goto done;
6738 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6740 0ebf8283 2019-07-24 stsp goto done;
6742 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6744 0ebf8283 2019-07-24 stsp goto done;
6745 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6747 0ebf8283 2019-07-24 stsp goto done;
6749 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6751 0ebf8283 2019-07-24 stsp goto done;
6752 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6754 0ebf8283 2019-07-24 stsp goto done;
6756 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6757 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6758 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6759 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6760 0ebf8283 2019-07-24 stsp return err;
6763 0ebf8283 2019-07-24 stsp const struct got_error *
6764 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
6765 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6766 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
6767 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6769 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6770 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6771 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6772 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6773 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6775 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6777 0ebf8283 2019-07-24 stsp return err;
6779 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6780 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6782 0ebf8283 2019-07-24 stsp goto done;
6784 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6786 0ebf8283 2019-07-24 stsp goto done;
6788 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6790 0ebf8283 2019-07-24 stsp goto done;
6792 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6793 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6795 0ebf8283 2019-07-24 stsp goto done;
6797 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6799 0ebf8283 2019-07-24 stsp goto done;
6801 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6803 0ebf8283 2019-07-24 stsp goto done;
6805 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6806 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6807 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6808 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6809 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6810 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6811 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6812 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6813 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6815 1f1abb7e 2019-08-08 stsp goto sync;
6817 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6818 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6820 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6821 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6822 0ebf8283 2019-07-24 stsp err = sync_err;
6824 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6825 0ebf8283 2019-07-24 stsp free(tree_id);
6826 818c7501 2019-07-11 stsp free(fileindex_path);
6828 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6829 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6830 818c7501 2019-07-11 stsp err = unlockerr;
6831 818c7501 2019-07-11 stsp return err;
6834 0ebf8283 2019-07-24 stsp const struct got_error *
6835 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6836 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6837 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6839 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
6840 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6841 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6843 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6845 0ebf8283 2019-07-24 stsp return err;
6847 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6848 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
6850 0ebf8283 2019-07-24 stsp goto done;
6852 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
6854 0ebf8283 2019-07-24 stsp goto done;
6856 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
6858 0ebf8283 2019-07-24 stsp goto done;
6860 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6862 0ebf8283 2019-07-24 stsp goto done;
6864 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6866 3e3a69f1 2019-07-25 stsp if (fileindex)
6867 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6868 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
6869 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6870 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6871 0ebf8283 2019-07-24 stsp err = unlockerr;
6872 0ebf8283 2019-07-24 stsp return err;
6875 0ebf8283 2019-07-24 stsp const struct got_error *
6876 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6877 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6879 0ebf8283 2019-07-24 stsp const struct got_error *err;
6880 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6882 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6884 0ebf8283 2019-07-24 stsp return err;
6886 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6888 0ebf8283 2019-07-24 stsp goto done;
6890 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6892 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6893 2822a352 2019-10-15 stsp return err;
6896 2822a352 2019-10-15 stsp const struct got_error *
6897 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6898 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6899 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
6900 2822a352 2019-10-15 stsp struct got_repository *repo)
6902 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
6903 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6904 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
6906 2822a352 2019-10-15 stsp *fileindex = NULL;
6907 2822a352 2019-10-15 stsp *branch_ref = NULL;
6908 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6910 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
6912 2822a352 2019-10-15 stsp return err;
6914 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6915 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6916 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
6917 2822a352 2019-10-15 stsp "update -b or different branch name required");
6918 2822a352 2019-10-15 stsp goto done;
6921 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6923 2822a352 2019-10-15 stsp goto done;
6925 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
6926 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
6927 2822a352 2019-10-15 stsp ok_arg.repo = repo;
6928 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6931 2822a352 2019-10-15 stsp goto done;
6933 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
6935 2822a352 2019-10-15 stsp goto done;
6937 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
6938 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
6940 2822a352 2019-10-15 stsp if (err) {
6941 2822a352 2019-10-15 stsp if (*branch_ref) {
6942 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
6943 2822a352 2019-10-15 stsp *branch_ref = NULL;
6945 2822a352 2019-10-15 stsp if (*base_branch_ref) {
6946 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
6947 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6949 2822a352 2019-10-15 stsp if (*fileindex) {
6950 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
6951 2822a352 2019-10-15 stsp *fileindex = NULL;
6953 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
6955 0cb83759 2019-08-03 stsp return err;
6958 2822a352 2019-10-15 stsp const struct got_error *
6959 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
6960 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6961 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6962 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6963 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6965 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6966 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6967 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6969 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6971 2822a352 2019-10-15 stsp goto done;
6973 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6975 2822a352 2019-10-15 stsp goto done;
6977 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6978 2822a352 2019-10-15 stsp worktree->path_prefix);
6980 2822a352 2019-10-15 stsp goto done;
6982 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6984 2822a352 2019-10-15 stsp goto done;
6986 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6987 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6989 2822a352 2019-10-15 stsp goto sync;
6991 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6993 2822a352 2019-10-15 stsp goto sync;
6995 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
6997 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6998 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
6999 2822a352 2019-10-15 stsp err = sync_err;
7002 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7003 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7004 2822a352 2019-10-15 stsp err = unlockerr;
7005 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7007 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7008 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7009 2822a352 2019-10-15 stsp err = unlockerr;
7010 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7012 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7013 2822a352 2019-10-15 stsp free(fileindex_path);
7014 2822a352 2019-10-15 stsp free(tree_id);
7016 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7017 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7018 2822a352 2019-10-15 stsp err = unlockerr;
7019 2822a352 2019-10-15 stsp return err;
7022 2822a352 2019-10-15 stsp const struct got_error *
7023 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7024 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7025 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7027 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7029 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7031 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7033 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7034 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7035 8b692cd0 2019-10-21 stsp err = unlockerr;
7036 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7038 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7039 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7040 8b692cd0 2019-10-21 stsp err = unlockerr;
7041 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7043 8b692cd0 2019-10-21 stsp return err;
7046 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7047 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7048 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7049 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7050 2db2652d 2019-08-07 stsp struct got_repository *repo;
7051 2db2652d 2019-08-07 stsp int have_changes;
7054 2db2652d 2019-08-07 stsp const struct got_error *
7055 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7056 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7057 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7058 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7060 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7061 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7062 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7063 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7064 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7065 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7067 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7068 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7069 8b13ce36 2019-08-08 stsp return NULL;
7070 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7071 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7073 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7074 735ef5ac 2019-08-03 stsp if (ie == NULL)
7075 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7077 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7078 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7079 735ef5ac 2019-08-03 stsp relpath) == -1)
7080 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7082 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7083 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7084 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7085 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7088 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7089 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7090 3aa5969e 2019-08-06 stsp goto done;
7091 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7092 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7093 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7094 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7095 735ef5ac 2019-08-03 stsp goto done;
7098 2db2652d 2019-08-07 stsp a->have_changes = 1;
7100 735ef5ac 2019-08-03 stsp p = in_repo_path;
7101 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7103 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7104 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7105 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7107 735ef5ac 2019-08-03 stsp free(in_repo_path);
7108 dc424a06 2019-08-07 stsp return err;
7111 2db2652d 2019-08-07 stsp struct stage_path_arg {
7112 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7113 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7114 2db2652d 2019-08-07 stsp struct got_repository *repo;
7115 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7116 2db2652d 2019-08-07 stsp void *status_arg;
7117 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7118 2db2652d 2019-08-07 stsp void *patch_arg;
7119 7b5dc508 2019-10-28 stsp int staged_something;
7120 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7123 2db2652d 2019-08-07 stsp static const struct got_error *
7124 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7125 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7126 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7127 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7129 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7130 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7131 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7132 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7133 0cb83759 2019-08-03 stsp uint32_t stage;
7134 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7135 0aeb8099 2020-07-23 stsp struct stat sb;
7137 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7138 8b13ce36 2019-08-08 stsp return NULL;
7140 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7141 d3e7c587 2019-08-03 stsp if (ie == NULL)
7142 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7144 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7145 2db2652d 2019-08-07 stsp relpath)== -1)
7146 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7148 0cb83759 2019-08-03 stsp switch (status) {
7149 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7150 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7151 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7152 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7153 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7156 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7157 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7158 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7159 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7160 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7163 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7166 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7167 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7168 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7169 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7170 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7174 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7175 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7178 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7179 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7180 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7181 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7183 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7184 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7185 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7186 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7187 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7188 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7189 35213c7c 2020-07-23 stsp ssize_t target_len;
7190 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7191 35213c7c 2020-07-23 stsp sizeof(target_path));
7192 35213c7c 2020-07-23 stsp if (target_len == -1) {
7193 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7194 35213c7c 2020-07-23 stsp ondisk_path);
7197 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7198 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7199 35213c7c 2020-07-23 stsp a->worktree->root_path);
7202 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7203 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7204 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7208 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7209 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7210 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7212 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7213 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7215 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7216 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7218 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7219 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7221 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7222 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7223 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7225 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7226 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7228 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7229 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7230 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7231 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7234 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7236 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7237 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7241 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7242 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7243 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7244 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7246 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7247 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7250 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7252 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7253 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7255 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7256 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7259 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7263 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7264 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7265 dc424a06 2019-08-07 stsp free(path_content);
7266 2db2652d 2019-08-07 stsp free(ondisk_path);
7267 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7268 0ebf8283 2019-07-24 stsp return err;
7271 0cb83759 2019-08-03 stsp const struct got_error *
7272 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7273 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7274 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7275 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7276 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
7278 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7279 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7280 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7281 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7282 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7283 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7284 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7285 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7287 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7289 0cb83759 2019-08-03 stsp return err;
7291 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7292 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7294 735ef5ac 2019-08-03 stsp goto done;
7295 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7297 735ef5ac 2019-08-03 stsp goto done;
7298 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7300 0cb83759 2019-08-03 stsp goto done;
7302 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7303 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7304 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7305 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7306 2db2652d 2019-08-07 stsp oka.repo = repo;
7307 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7308 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7309 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7310 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7312 735ef5ac 2019-08-03 stsp goto done;
7314 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7315 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7316 2db2652d 2019-08-07 stsp goto done;
7319 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7320 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7321 2db2652d 2019-08-07 stsp spa.repo = repo;
7322 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7323 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7324 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7325 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7326 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7327 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
7328 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7329 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7330 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7332 2db2652d 2019-08-07 stsp goto done;
7334 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7335 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7336 7b5dc508 2019-10-28 stsp goto done;
7339 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7340 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7341 0cb83759 2019-08-03 stsp err = sync_err;
7343 735ef5ac 2019-08-03 stsp if (head_ref)
7344 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7345 735ef5ac 2019-08-03 stsp free(head_commit_id);
7346 0cb83759 2019-08-03 stsp free(fileindex_path);
7347 0cb83759 2019-08-03 stsp if (fileindex)
7348 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7349 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7350 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7351 0cb83759 2019-08-03 stsp err = unlockerr;
7352 0cb83759 2019-08-03 stsp return err;
7355 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7356 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7357 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7358 ad493afc 2019-08-03 stsp struct got_repository *repo;
7359 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7360 ad493afc 2019-08-03 stsp void *progress_arg;
7361 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7362 2e1f37b0 2019-08-08 stsp void *patch_arg;
7365 2e1f37b0 2019-08-08 stsp static const struct got_error *
7366 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7367 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7368 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7369 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7370 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7372 2e1f37b0 2019-08-08 stsp const struct got_error *err;
7373 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7374 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7375 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7376 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
7377 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
7378 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
7379 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
7380 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
7381 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
7382 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
7384 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7385 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7387 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7389 2e1f37b0 2019-08-08 stsp return err;
7390 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7392 2e1f37b0 2019-08-08 stsp goto done;
7394 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7396 2e1f37b0 2019-08-08 stsp goto done;
7398 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7400 2e1f37b0 2019-08-08 stsp goto done;
7402 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7404 2e1f37b0 2019-08-08 stsp goto done;
7406 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7408 2e1f37b0 2019-08-08 stsp goto done;
7410 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7412 2e1f37b0 2019-08-08 stsp goto done;
7414 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
7415 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
7416 2e1f37b0 2019-08-08 stsp goto done;
7419 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
7420 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
7421 2e1f37b0 2019-08-08 stsp goto done;
7424 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
7425 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
7427 2e1f37b0 2019-08-08 stsp goto done;
7429 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7430 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7432 2e1f37b0 2019-08-08 stsp goto done;
7433 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7434 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7436 2e1f37b0 2019-08-08 stsp goto done;
7438 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7439 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7440 2e1f37b0 2019-08-08 stsp goto done;
7442 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7443 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7444 2e1f37b0 2019-08-08 stsp goto done;
7446 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
7447 2e1f37b0 2019-08-08 stsp int choice;
7448 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
7449 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
7450 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
7451 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
7453 2e1f37b0 2019-08-08 stsp goto done;
7454 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7455 2e1f37b0 2019-08-08 stsp have_content = 1;
7457 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7458 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7461 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7462 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7463 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7465 2e1f37b0 2019-08-08 stsp free(label1);
7467 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7468 2e1f37b0 2019-08-08 stsp if (staged_blob)
7469 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7470 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7471 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7472 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7473 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7474 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7475 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7476 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7477 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7478 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7479 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7480 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7481 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7482 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7483 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7484 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7485 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7486 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7487 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7488 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7490 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
7491 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7492 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7493 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7494 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7495 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7496 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7498 2e1f37b0 2019-08-08 stsp free(args);
7500 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
7503 2e1f37b0 2019-08-08 stsp if (changes)
7504 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
7505 2e1f37b0 2019-08-08 stsp free(path1);
7506 2e1f37b0 2019-08-08 stsp free(path2);
7507 fda8017d 2020-07-23 stsp return err;
7510 fda8017d 2020-07-23 stsp static const struct got_error *
7511 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
7512 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
7513 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7514 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
7515 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
7516 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7517 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7519 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
7520 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
7521 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
7522 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
7523 fda8017d 2020-07-23 stsp FILE *f = NULL;
7524 fda8017d 2020-07-23 stsp struct stat sb;
7526 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
7527 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
7528 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
7530 fda8017d 2020-07-23 stsp return err;
7532 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
7533 fda8017d 2020-07-23 stsp return NULL;
7535 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
7536 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
7537 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
7539 fda8017d 2020-07-23 stsp goto done;
7542 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
7543 fda8017d 2020-07-23 stsp if (f == NULL) {
7544 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
7545 fda8017d 2020-07-23 stsp path_unstaged_content);
7546 fda8017d 2020-07-23 stsp goto done;
7548 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
7549 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
7550 fda8017d 2020-07-23 stsp goto done;
7552 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
7553 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7554 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
7556 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
7557 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
7558 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
7559 fda8017d 2020-07-23 stsp goto done;
7561 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
7562 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
7563 fda8017d 2020-07-23 stsp goto done;
7565 fda8017d 2020-07-23 stsp link_target[r] = '\0';
7566 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
7567 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
7568 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
7569 fda8017d 2020-07-23 stsp progress_arg);
7571 fda8017d 2020-07-23 stsp int local_changes_subsumed;
7572 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
7573 fda8017d 2020-07-23 stsp blob_base, ondisk_path, ie->path,
7574 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
7575 fda8017d 2020-07-23 stsp path_unstaged_content, label_orig, "unstaged",
7576 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
7579 fda8017d 2020-07-23 stsp goto done;
7581 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
7582 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7583 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
7585 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7587 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
7588 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
7589 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7590 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7591 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
7592 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7593 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7594 fda8017d 2020-07-23 stsp if (f && fclose(f) != 0 && err == NULL)
7595 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7596 fda8017d 2020-07-23 stsp free(path_unstaged_content);
7597 fda8017d 2020-07-23 stsp free(path_new_staged_content);
7598 2e1f37b0 2019-08-08 stsp return err;
7601 ad493afc 2019-08-03 stsp static const struct got_error *
7602 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7603 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7604 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7605 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7607 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7608 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7609 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7610 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7611 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
7612 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7613 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7614 9bc94a15 2019-08-03 stsp struct stat sb;
7616 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7617 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7618 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7619 2e1f37b0 2019-08-08 stsp return NULL;
7621 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7622 ad493afc 2019-08-03 stsp if (ie == NULL)
7623 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7625 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7627 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7629 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7630 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7632 f69721c3 2019-10-21 stsp goto done;
7633 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7634 f69721c3 2019-10-21 stsp id_str) == -1) {
7635 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7636 f69721c3 2019-10-21 stsp goto done;
7639 ad493afc 2019-08-03 stsp switch (staged_status) {
7640 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7641 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7642 ad493afc 2019-08-03 stsp blob_id, 8192);
7645 ad493afc 2019-08-03 stsp /* fall through */
7646 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7647 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7648 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7649 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7650 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7651 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7654 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7657 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
7658 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
7659 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
7660 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
7661 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
7662 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7665 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7666 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7669 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
7670 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
7671 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
7672 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7673 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
7674 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
7675 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
7676 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7677 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
7679 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
7680 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7681 36bf999c 2020-07-23 stsp char *staged_target;
7682 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
7683 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
7685 36bf999c 2020-07-23 stsp goto done;
7686 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
7687 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
7688 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
7689 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
7690 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
7691 36bf999c 2020-07-23 stsp free(staged_target);
7693 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
7694 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
7695 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
7696 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
7697 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
7698 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7699 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
7703 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
7706 ad493afc 2019-08-03 stsp if (err == NULL)
7707 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
7708 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
7710 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
7711 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7712 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7713 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7714 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7717 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7719 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7720 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7724 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7725 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
7726 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
7729 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
7733 ad493afc 2019-08-03 stsp free(ondisk_path);
7734 ad493afc 2019-08-03 stsp if (blob_base)
7735 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
7736 ad493afc 2019-08-03 stsp if (blob_staged)
7737 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
7738 f69721c3 2019-10-21 stsp free(id_str);
7739 f69721c3 2019-10-21 stsp free(label_orig);
7740 ad493afc 2019-08-03 stsp return err;
7743 ad493afc 2019-08-03 stsp const struct got_error *
7744 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
7745 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
7746 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7747 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7748 ad493afc 2019-08-03 stsp struct got_repository *repo)
7750 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7751 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7752 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7753 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
7754 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
7756 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7758 ad493afc 2019-08-03 stsp return err;
7760 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7762 ad493afc 2019-08-03 stsp goto done;
7764 ad493afc 2019-08-03 stsp upa.worktree = worktree;
7765 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
7766 ad493afc 2019-08-03 stsp upa.repo = repo;
7767 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
7768 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
7769 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
7770 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
7771 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7772 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7773 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
7775 ad493afc 2019-08-03 stsp goto done;
7778 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7779 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
7780 ad493afc 2019-08-03 stsp err = sync_err;
7782 ad493afc 2019-08-03 stsp free(fileindex_path);
7783 ad493afc 2019-08-03 stsp if (fileindex)
7784 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
7785 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7786 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
7787 ad493afc 2019-08-03 stsp err = unlockerr;
7788 ad493afc 2019-08-03 stsp return err;
7791 b2118c49 2020-07-28 stsp struct report_file_info_arg {
7792 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
7793 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
7794 b2118c49 2020-07-28 stsp void *info_arg;
7795 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
7796 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
7797 b2118c49 2020-07-28 stsp void *cancel_arg;
7800 b2118c49 2020-07-28 stsp static const struct got_error *
7801 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
7803 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
7804 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
7805 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
7806 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
7807 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
7808 b2118c49 2020-07-28 stsp int stage;
7810 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
7811 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
7813 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
7814 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
7815 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
7818 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
7819 b2118c49 2020-07-28 stsp return NULL;
7821 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
7822 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
7823 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
7825 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
7826 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
7827 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
7828 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
7829 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
7830 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
7833 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
7834 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
7835 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
7838 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
7839 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
7842 b2118c49 2020-07-28 stsp const struct got_error *
7843 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
7844 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
7845 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
7846 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7849 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
7850 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
7851 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
7852 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
7854 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
7856 b2118c49 2020-07-28 stsp return err;
7858 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7860 b2118c49 2020-07-28 stsp goto done;
7862 b2118c49 2020-07-28 stsp arg.worktree = worktree;
7863 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
7864 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
7865 b2118c49 2020-07-28 stsp arg.paths = paths;
7866 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
7867 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
7868 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
7871 b2118c49 2020-07-28 stsp free(fileindex_path);
7872 b2118c49 2020-07-28 stsp if (fileindex)
7873 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
7874 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
7875 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
7876 b2118c49 2020-07-28 stsp err = unlockerr;
7877 b2118c49 2020-07-28 stsp return err;
