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 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1296 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1298 ce031e9e 2020-10-20 stsp return err;
1299 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1300 ce031e9e 2020-10-20 stsp free(parent);
1301 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1303 ce031e9e 2020-10-20 stsp free(parent);
1304 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1305 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1306 3c1ec782 2020-07-23 stsp free(abspath);
1307 3c1ec782 2020-07-23 stsp return err;
1309 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1310 3c1ec782 2020-07-23 stsp free(abspath);
1312 3c1ec782 2020-07-23 stsp return err;
1314 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1316 3c1ec782 2020-07-23 stsp return err;
1319 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1320 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1321 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1322 3c1ec782 2020-07-23 stsp return NULL;
1325 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1326 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1327 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1328 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1329 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1330 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1332 3c1ec782 2020-07-23 stsp free(path_got);
1333 3c1ec782 2020-07-23 stsp return NULL;
1336 5a1fbc73 2020-07-23 stsp static const struct got_error *
1337 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1338 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1339 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1340 c90c8ce3 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1341 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1343 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1344 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1345 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1346 906c123b 2020-07-23 stsp char *path_got = NULL;
1347 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1348 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1350 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1353 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1354 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1355 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1356 8ba819a3 2020-07-23 stsp * in the blob object.
1359 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1360 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1361 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1362 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1363 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1364 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1365 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1366 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1367 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1368 3b9f0f87 2020-07-23 stsp progress_arg);
1370 8ba819a3 2020-07-23 stsp if (len > 0) {
1371 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1372 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1373 8ba819a3 2020-07-23 stsp len - hdrlen);
1374 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1375 8ba819a3 2020-07-23 stsp hdrlen = 0;
1377 8ba819a3 2020-07-23 stsp } while (len != 0);
1378 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1380 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1381 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1383 3c1ec782 2020-07-23 stsp return err;
1385 3c1ec782 2020-07-23 stsp if (*is_bad_symlink) {
1386 906c123b 2020-07-23 stsp /* install as a regular file */
1387 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1388 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1389 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1390 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1391 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1392 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1393 906c123b 2020-07-23 stsp goto done;
1396 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1397 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1398 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1399 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1400 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1401 c90c8ce3 2020-07-23 stsp goto done;
1403 5a1fbc73 2020-07-23 stsp err = replace_existing_symlink(ondisk_path,
1404 5a1fbc73 2020-07-23 stsp target_path, target_len);
1406 f35fa46a 2020-07-23 stsp goto done;
1407 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1408 5a1fbc73 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1409 6e1eade5 2020-07-23 stsp reverting_versioned_file ?
1410 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
1413 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1416 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1417 f4994adc 2020-10-20 stsp char *parent;
1418 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1420 f4994adc 2020-10-20 stsp goto done;
1421 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1422 f4994adc 2020-10-20 stsp free(parent);
1424 f35fa46a 2020-07-23 stsp goto done;
1426 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1427 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1429 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1430 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1431 f35fa46a 2020-07-23 stsp goto done;
1435 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1436 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1437 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1438 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1439 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1440 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1441 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1442 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1443 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1444 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1445 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1446 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1447 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1449 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1450 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1452 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1453 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1454 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1456 906c123b 2020-07-23 stsp free(path_got);
1457 8ba819a3 2020-07-23 stsp return err;
1460 8ba819a3 2020-07-23 stsp static const struct got_error *
1461 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1462 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1463 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1464 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1465 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1466 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1468 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1469 507dc3bb 2018-12-29 stsp int fd = -1;
1470 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1471 507dc3bb 2018-12-29 stsp int update = 0;
1472 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1474 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1475 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1476 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1477 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1478 f5375317 2020-10-20 stsp char *parent;
1479 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1481 f5375317 2020-10-20 stsp return err;
1482 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1483 f5375317 2020-10-20 stsp free(parent);
1485 21908da4 2019-01-13 stsp return err;
1486 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1487 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1488 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1489 21908da4 2019-01-13 stsp if (fd == -1)
1490 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1491 230a42bd 2019-05-11 jcs ondisk_path);
1492 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1493 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1494 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1495 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1496 3b9f0f87 2020-07-23 stsp goto done;
1498 bd6aa359 2020-07-23 stsp if (!S_ISREG(st_mode) && !installing_bad_symlink) {
1499 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1500 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1501 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1502 507dc3bb 2018-12-29 stsp goto done;
1504 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1505 507dc3bb 2018-12-29 stsp ondisk_path);
1507 507dc3bb 2018-12-29 stsp goto done;
1508 507dc3bb 2018-12-29 stsp update = 1;
1511 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1514 bd6aa359 2020-07-23 stsp if (progress_cb) {
1515 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1516 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1518 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1519 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1522 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1523 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1525 bd6aa359 2020-07-23 stsp goto done;
1528 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1530 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1531 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1534 9d31a1d8 2018-03-11 stsp if (len > 0) {
1535 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1536 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1537 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1538 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1539 b87c6f83 2018-12-24 stsp goto done;
1540 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1541 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1542 b87c6f83 2018-12-24 stsp goto done;
1544 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1546 9d31a1d8 2018-03-11 stsp } while (len != 0);
1548 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1549 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1550 816dc654 2019-02-16 stsp goto done;
1553 507dc3bb 2018-12-29 stsp if (update) {
1554 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1555 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1556 230a42bd 2019-05-11 jcs ondisk_path);
1557 2a57020b 2019-02-20 stsp unlink(tmppath);
1558 68ed9ba5 2019-02-10 stsp goto done;
1562 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1563 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1564 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1565 1ebedb77 2019-10-19 stsp goto done;
1569 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1570 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1571 507dc3bb 2018-12-29 stsp free(tmppath);
1572 6353ad76 2019-02-08 stsp return err;
1575 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1576 6353ad76 2019-02-08 stsp static const struct got_error *
1577 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1579 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1580 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1581 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1582 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1583 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1585 7154f6ce 2019-03-27 stsp int i = 0;
1586 7154f6ce 2019-03-27 stsp char *line;
1587 7154f6ce 2019-03-27 stsp size_t len;
1588 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1590 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1591 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1592 7154f6ce 2019-03-27 stsp if (line == NULL) {
1593 7154f6ce 2019-03-27 stsp if (feof(f))
1595 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1599 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1600 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1602 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1608 7154f6ce 2019-03-27 stsp return err;
1611 e2b1e152 2019-07-13 stsp static int
1612 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1614 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1615 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1618 1ebedb77 2019-10-19 stsp static int
1619 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1621 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1622 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1623 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1624 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1625 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1626 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1629 c363b2c1 2019-08-03 stsp static unsigned char
1630 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1632 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1633 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1634 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1635 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1636 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1637 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1638 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1640 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1644 a919d5c4 2020-07-23 stsp static const struct got_error *
1645 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1646 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1647 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1649 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1650 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1651 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1652 a919d5c4 2020-07-23 stsp ssize_t elen;
1653 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1654 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1655 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1657 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1659 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1661 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1663 a919d5c4 2020-07-23 stsp return err;
1664 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1666 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1667 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1669 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1671 a919d5c4 2020-07-23 stsp if (len > 0) {
1672 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1673 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1674 a919d5c4 2020-07-23 stsp len - hdrlen);
1675 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1676 a919d5c4 2020-07-23 stsp hdrlen = 0;
1678 a919d5c4 2020-07-23 stsp } while (len != 0);
1679 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1681 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1682 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1683 a919d5c4 2020-07-23 stsp if (elen == -1)
1684 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1686 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1687 a919d5c4 2020-07-23 stsp if (elen == -1)
1688 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1691 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1692 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1694 a919d5c4 2020-07-23 stsp return NULL;
1697 7154f6ce 2019-03-27 stsp static const struct got_error *
1698 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1699 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1700 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1702 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1703 6353ad76 2019-02-08 stsp struct got_object_id id;
1704 6353ad76 2019-02-08 stsp size_t hdrlen;
1705 1338848f 2019-12-13 stsp int fd = -1;
1706 6353ad76 2019-02-08 stsp FILE *f = NULL;
1707 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1708 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1709 6353ad76 2019-02-08 stsp size_t flen, blen;
1710 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1712 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1715 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1716 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1717 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1719 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1720 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1721 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1722 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1723 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1725 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1726 882ef1b9 2019-12-13 stsp goto done;
1728 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1729 3d35a492 2019-12-13 stsp goto done;
1732 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1733 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1734 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1735 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1736 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1737 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1738 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1739 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1740 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1741 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1743 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1744 3d35a492 2019-12-13 stsp goto done;
1746 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1747 1338848f 2019-12-13 stsp goto done;
1751 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1752 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1753 1338848f 2019-12-13 stsp goto done;
1756 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1757 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1758 1338848f 2019-12-13 stsp goto done;
1759 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1760 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1761 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1762 1338848f 2019-12-13 stsp goto done;
1765 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1766 f179e66d 2020-07-23 stsp goto done;
1768 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1769 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1770 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1771 1338848f 2019-12-13 stsp goto done;
1774 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1775 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1776 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1778 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1780 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1782 1338848f 2019-12-13 stsp goto done;
1784 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1785 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1786 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1787 a919d5c4 2020-07-23 stsp goto done;
1790 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1791 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1792 ab0d4361 2019-12-13 stsp if (fd == -1) {
1793 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1794 ab0d4361 2019-12-13 stsp goto done;
1798 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1799 6353ad76 2019-02-08 stsp if (f == NULL) {
1800 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1801 6353ad76 2019-02-08 stsp goto done;
1804 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1806 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1807 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1809 7154f6ce 2019-03-27 stsp goto done;
1810 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1811 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1812 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1813 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1814 7154f6ce 2019-03-27 stsp goto done;
1816 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1817 6353ad76 2019-02-08 stsp if (flen != 0)
1818 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1820 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1821 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1822 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1824 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1825 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1826 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1827 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1831 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1834 6353ad76 2019-02-08 stsp hdrlen = 0;
1837 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1838 7154f6ce 2019-03-27 stsp rewind(f);
1839 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1840 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1841 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1844 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1845 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1846 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1847 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1848 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1849 9d31a1d8 2018-03-11 stsp return err;
1853 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1854 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1856 e2b1e152 2019-07-13 stsp static const struct got_error *
1857 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1858 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1860 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1861 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1862 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1864 e2b1e152 2019-07-13 stsp return NULL;
1867 9d31a1d8 2018-03-11 stsp static const struct got_error *
1868 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1869 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1870 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1871 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1872 0584f854 2019-04-06 stsp void *progress_arg)
1874 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1875 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1876 6353ad76 2019-02-08 stsp char *ondisk_path;
1877 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1878 b8f41171 2019-02-10 stsp struct stat sb;
1880 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1881 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1884 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1885 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1886 a76c42e6 2019-08-03 stsp goto done;
1888 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1891 abb4604f 2019-07-27 stsp goto done;
1892 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1893 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1895 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1896 c90c8ce3 2020-07-23 stsp status = GOT_STATUS_UNVERSIONED;
1899 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1900 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1901 b8f41171 2019-02-10 stsp goto done;
1903 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1904 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1906 5036ab18 2020-04-18 stsp goto done;
1909 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1910 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1911 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1912 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1913 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1914 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1916 e2b1e152 2019-07-13 stsp goto done;
1917 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1919 6353ad76 2019-02-08 stsp goto done;
1921 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1922 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1923 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1924 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1925 b8f41171 2019-02-10 stsp goto done;
1929 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1931 6353ad76 2019-02-08 stsp goto done;
1933 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1934 234035bc 2019-06-01 stsp int update_timestamps;
1935 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1936 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1937 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1938 234035bc 2019-06-01 stsp struct got_object_id id2;
1939 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1940 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1942 f69721c3 2019-10-21 stsp goto done;
1944 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1945 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1946 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1947 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1948 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1949 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1950 f69721c3 2019-10-21 stsp goto done;
1952 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1953 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1954 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1955 234035bc 2019-06-01 stsp goto done;
1958 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1959 36bf999c 2020-07-23 stsp char *link_target;
1960 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1962 36bf999c 2020-07-23 stsp goto done;
1963 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1964 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1965 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1966 36bf999c 2020-07-23 stsp free(link_target);
1968 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1969 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1970 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1971 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1973 f69721c3 2019-10-21 stsp free(label_orig);
1974 234035bc 2019-06-01 stsp if (blob2)
1975 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1977 909d120e 2019-09-22 stsp goto done;
1979 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1980 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1981 234035bc 2019-06-01 stsp * unmodified files again.
1983 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1984 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1985 234035bc 2019-06-01 stsp update_timestamps);
1986 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1987 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1988 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1989 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1990 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1992 1ee397ad 2019-07-12 stsp goto done;
1993 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1994 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1996 13d9040b 2019-03-27 stsp goto done;
1998 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1999 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
2000 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
2001 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2002 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2003 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2004 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2006 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2007 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2008 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2009 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2010 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2013 13d9040b 2019-03-27 stsp goto done;
2016 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2017 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
2019 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2020 054041d0 2020-06-24 stsp worktree->base_commit_id, ondisk_path, path,
2021 054041d0 2020-06-24 stsp &blob->id);
2024 13d9040b 2019-03-27 stsp goto done;
2026 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2027 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2028 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2031 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2033 6353ad76 2019-02-08 stsp free(ondisk_path);
2034 8da9e5f4 2019-01-12 stsp return err;
2037 90285c3b 2019-01-08 stsp static const struct got_error *
2038 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2040 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2041 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
2043 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2044 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2046 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2047 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2048 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2050 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
2051 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
2052 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
2053 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2054 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2058 90285c3b 2019-01-08 stsp parent = dirname(parent);
2061 90285c3b 2019-01-08 stsp free(ondisk_path);
2062 90285c3b 2019-01-08 stsp return err;
2065 708d8e67 2019-03-27 stsp static const struct got_error *
2066 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2067 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2068 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2070 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2071 708d8e67 2019-03-27 stsp unsigned char status;
2072 708d8e67 2019-03-27 stsp struct stat sb;
2073 708d8e67 2019-03-27 stsp char *ondisk_path;
2075 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2076 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2078 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2080 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2082 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2084 5a58a424 2020-06-23 stsp goto done;
2086 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2087 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2088 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2089 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2090 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2091 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2092 993e2a1b 2020-07-23 stsp goto done;
2094 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2095 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2096 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2097 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2099 993e2a1b 2020-07-23 stsp goto done;
2100 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2101 993e2a1b 2020-07-23 stsp ie->path);
2102 993e2a1b 2020-07-23 stsp goto done;
2105 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2106 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2107 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2109 5a58a424 2020-06-23 stsp goto done;
2111 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2112 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2114 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
2117 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2119 5a58a424 2020-06-23 stsp goto done;
2120 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2121 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2123 5a58a424 2020-06-23 stsp goto done;
2125 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2128 5a58a424 2020-06-23 stsp free(ondisk_path);
2129 fc6346c4 2019-03-27 stsp return err;
2132 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2133 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2134 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2135 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2136 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2137 8da9e5f4 2019-01-12 stsp void *progress_arg;
2138 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2139 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2142 512f0d0e 2019-01-02 stsp static const struct got_error *
2143 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2144 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2146 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2148 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2149 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2151 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2152 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2155 8da9e5f4 2019-01-12 stsp static const struct got_error *
2156 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2158 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2160 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2161 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2163 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2164 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2167 9d31a1d8 2018-03-11 stsp static const struct got_error *
2168 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2170 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2171 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2172 8da9e5f4 2019-01-12 stsp char *path;
2174 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2175 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2177 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2178 63c5ca5d 2019-08-24 stsp return NULL;
2180 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2181 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2183 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2185 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2186 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2188 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2189 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2191 8da9e5f4 2019-01-12 stsp free(path);
2192 0cd1c46a 2019-03-11 stsp return err;
2195 b2118c49 2020-07-28 stsp const struct got_error *
2196 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2198 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2200 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2201 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2202 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2203 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2206 b2118c49 2020-07-28 stsp return NULL;
2209 818c7501 2019-07-11 stsp static const struct got_error *
2210 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2212 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2213 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2215 517bab73 2019-03-11 stsp *refname = NULL;
2217 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2219 b2118c49 2020-07-28 stsp return err;
2221 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2222 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2223 0647c563 2019-03-11 stsp *refname = NULL;
2225 517bab73 2019-03-11 stsp free(uuidstr);
2226 517bab73 2019-03-11 stsp return err;
2229 818c7501 2019-07-11 stsp const struct got_error *
2230 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2232 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2235 818c7501 2019-07-11 stsp static const struct got_error *
2236 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2238 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2239 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2242 818c7501 2019-07-11 stsp static const struct got_error *
2243 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2245 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2248 818c7501 2019-07-11 stsp static const struct got_error *
2249 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2251 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2252 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2255 818c7501 2019-07-11 stsp static const struct got_error *
2256 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2258 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2259 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2262 0ebf8283 2019-07-24 stsp static const struct got_error *
2263 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2265 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2266 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2269 0ebf8283 2019-07-24 stsp static const struct got_error *
2270 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2272 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2273 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2276 0ebf8283 2019-07-24 stsp static const struct got_error *
2277 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2279 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2280 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2283 0ebf8283 2019-07-24 stsp static const struct got_error *
2284 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2286 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2287 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2290 0ebf8283 2019-07-24 stsp const struct got_error *
2291 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2292 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2294 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2295 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2296 0ebf8283 2019-07-24 stsp *path = NULL;
2297 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2299 0ebf8283 2019-07-24 stsp return NULL;
2303 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2304 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2306 517bab73 2019-03-11 stsp static const struct got_error *
2307 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2309 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2310 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2311 517bab73 2019-03-11 stsp char *refname;
2313 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2315 517bab73 2019-03-11 stsp return err;
2317 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2319 0cd1c46a 2019-03-11 stsp goto done;
2321 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2323 0cd1c46a 2019-03-11 stsp free(refname);
2325 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2326 3e3a69f1 2019-07-25 stsp return err;
2329 3e3a69f1 2019-07-25 stsp static const struct got_error *
2330 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2332 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2334 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2335 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2336 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2337 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2339 9d31a1d8 2018-03-11 stsp return err;
2343 ebf99748 2019-05-09 stsp static const struct got_error *
2344 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2345 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2347 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2348 ebf99748 2019-05-09 stsp FILE *index = NULL;
2350 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2351 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2352 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2353 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2355 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2357 ebf99748 2019-05-09 stsp goto done;
2359 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2360 ebf99748 2019-05-09 stsp if (index == NULL) {
2361 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2362 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2364 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2365 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
2366 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2369 ebf99748 2019-05-09 stsp if (err) {
2370 ebf99748 2019-05-09 stsp free(*fileindex_path);
2371 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2372 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2373 ebf99748 2019-05-09 stsp *fileindex = NULL;
2375 ebf99748 2019-05-09 stsp return err;
2378 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2379 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2380 c932eeeb 2019-05-22 stsp const char *path;
2381 c932eeeb 2019-05-22 stsp size_t path_len;
2382 c932eeeb 2019-05-22 stsp const char *entry_name;
2383 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2384 a484d721 2019-06-10 stsp void *progress_arg;
2387 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2388 c932eeeb 2019-05-22 stsp static const struct got_error *
2389 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2391 1ee397ad 2019-07-12 stsp const struct got_error *err;
2392 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2394 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2395 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2396 c932eeeb 2019-05-22 stsp return NULL;
2397 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2398 102ff934 2019-06-11 stsp return NULL;
2400 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2401 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2402 c932eeeb 2019-05-22 stsp return NULL;
2404 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2405 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2406 edd02c5e 2019-07-11 stsp ie->path);
2408 1ee397ad 2019-07-12 stsp return err;
2410 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2411 c932eeeb 2019-05-22 stsp return NULL;
2414 9c6338c4 2019-06-02 stsp static const struct got_error *
2415 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2417 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2418 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2419 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2420 867630bb 2020-01-17 stsp struct timespec timeout;
2422 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2423 9c6338c4 2019-06-02 stsp fileindex_path);
2425 9c6338c4 2019-06-02 stsp goto done;
2427 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2429 9c6338c4 2019-06-02 stsp goto done;
2431 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2432 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2433 9c6338c4 2019-06-02 stsp fileindex_path);
2434 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2438 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2439 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2440 867630bb 2020-01-17 stsp * was recorded in the file index.
2442 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
2443 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
2444 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
2446 9c6338c4 2019-06-02 stsp if (new_index)
2447 9c6338c4 2019-06-02 stsp fclose(new_index);
2448 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2449 9c6338c4 2019-06-02 stsp return err;
2452 6ced4176 2019-07-12 stsp static const struct got_error *
2453 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2454 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2455 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2457 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2458 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2459 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2460 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2462 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2463 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2464 6ced4176 2019-07-12 stsp *tree_id = NULL;
2466 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2467 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2468 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2469 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2470 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2471 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2472 6ced4176 2019-07-12 stsp goto done;
2474 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2475 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2477 6ced4176 2019-07-12 stsp goto done;
2478 6ced4176 2019-07-12 stsp return NULL;
2481 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2483 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2484 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2485 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2486 6ced4176 2019-07-12 stsp goto done;
2489 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2490 6ced4176 2019-07-12 stsp in_repo_path);
2492 6ced4176 2019-07-12 stsp goto done;
2494 6ced4176 2019-07-12 stsp free(in_repo_path);
2495 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2497 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2499 6ced4176 2019-07-12 stsp goto done;
2501 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2502 6ced4176 2019-07-12 stsp /* Check out a single file. */
2503 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2504 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2505 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2506 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2507 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2508 6ced4176 2019-07-12 stsp goto done;
2510 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2511 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2512 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2513 6ced4176 2019-07-12 stsp goto done;
2516 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2517 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2519 6ced4176 2019-07-12 stsp return err;
2520 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2521 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2522 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2523 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2524 6ced4176 2019-07-12 stsp goto done;
2527 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2528 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2530 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2531 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2532 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2533 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2534 6ced4176 2019-07-12 stsp goto done;
2536 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2537 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2538 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2539 6ced4176 2019-07-12 stsp goto done;
2544 6ced4176 2019-07-12 stsp free(in_repo_path);
2545 6ced4176 2019-07-12 stsp if (err) {
2546 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2547 6ced4176 2019-07-12 stsp free(*tree_relpath);
2548 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2549 6ced4176 2019-07-12 stsp free(*tree_id);
2550 6ced4176 2019-07-12 stsp *tree_id = NULL;
2552 07ed472d 2019-07-12 stsp return err;
2555 07ed472d 2019-07-12 stsp static const struct got_error *
2556 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2557 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2558 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2559 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2561 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2562 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2563 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2564 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2565 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2567 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2568 7f47418f 2019-12-20 stsp if (err) {
2569 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2570 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2571 7f47418f 2019-12-20 stsp goto done;
2572 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2573 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2575 7f47418f 2019-12-20 stsp return err;
2578 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2579 07ed472d 2019-07-12 stsp worktree->base_commit_id);
2581 07ed472d 2019-07-12 stsp goto done;
2583 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2585 07ed472d 2019-07-12 stsp goto done;
2587 07ed472d 2019-07-12 stsp if (entry_name &&
2588 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2589 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2590 07ed472d 2019-07-12 stsp goto done;
2593 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2594 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2595 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2596 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2597 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2598 07ed472d 2019-07-12 stsp arg.repo = repo;
2599 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2600 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2601 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2602 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2603 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2604 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2607 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2608 07ed472d 2019-07-12 stsp if (commit)
2609 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2610 6ced4176 2019-07-12 stsp return err;
2613 9d31a1d8 2018-03-11 stsp const struct got_error *
2614 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2615 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2616 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2617 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2619 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2620 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2621 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2622 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2623 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2624 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2625 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2626 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2627 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2628 f2ea84fa 2019-07-27 stsp int entry_type;
2629 f2ea84fa 2019-07-27 stsp char *relpath;
2630 f2ea84fa 2019-07-27 stsp char *entry_name;
2631 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2632 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2634 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2636 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2638 9d31a1d8 2018-03-11 stsp return err;
2640 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2641 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2642 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2643 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2644 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2645 f2ea84fa 2019-07-27 stsp goto done;
2648 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2649 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2650 f2ea84fa 2019-07-27 stsp if (err) {
2651 f2ea84fa 2019-07-27 stsp free(tpd);
2652 6ced4176 2019-07-12 stsp goto done;
2655 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2656 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2657 f2ea84fa 2019-07-27 stsp if (err) {
2658 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2659 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2660 f2ea84fa 2019-07-27 stsp free(tpd);
2661 f2ea84fa 2019-07-27 stsp goto done;
2664 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2666 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2670 51514078 2018-12-25 stsp * Read the file index.
2671 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2672 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2674 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2676 c4cdcb68 2019-04-03 stsp goto done;
2678 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2679 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2680 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2682 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2683 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2684 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2688 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2689 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2690 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2691 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2692 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2693 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2694 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2695 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2699 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2701 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2702 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2703 af12c6b9 2019-06-04 stsp err = sync_err;
2705 9c6338c4 2019-06-02 stsp free(fileindex_path);
2707 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2708 9d31a1d8 2018-03-11 stsp if (commit)
2709 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2710 5ade8233 2019-07-12 stsp if (fileindex)
2711 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2712 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2713 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2714 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2715 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2716 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2717 f2ea84fa 2019-07-27 stsp free(tpd);
2719 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2720 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2721 9d31a1d8 2018-03-11 stsp err = unlockerr;
2722 f8d1f275 2019-02-04 stsp return err;
2725 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2726 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2727 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2728 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2729 234035bc 2019-06-01 stsp void *progress_arg;
2730 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2731 234035bc 2019-06-01 stsp void *cancel_arg;
2732 f69721c3 2019-10-21 stsp const char *label_orig;
2733 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2736 234035bc 2019-06-01 stsp static const struct got_error *
2737 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2738 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2739 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2740 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2742 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2743 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2744 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2745 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2746 234035bc 2019-06-01 stsp struct stat sb;
2747 234035bc 2019-06-01 stsp unsigned char status;
2748 234035bc 2019-06-01 stsp int local_changes_subsumed;
2750 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2751 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2752 d6c87207 2019-08-02 stsp strlen(path2));
2753 1ee397ad 2019-07-12 stsp if (ie == NULL)
2754 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2755 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2757 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2758 234035bc 2019-06-01 stsp path2) == -1)
2759 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2761 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2764 234035bc 2019-06-01 stsp goto done;
2766 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2767 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2768 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2769 234035bc 2019-06-01 stsp goto done;
2771 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2772 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2773 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2774 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2775 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2776 234035bc 2019-06-01 stsp goto done;
2779 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2780 36bf999c 2020-07-23 stsp char *link_target2;
2781 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2783 36bf999c 2020-07-23 stsp goto done;
2784 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2785 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2786 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2787 36bf999c 2020-07-23 stsp free(link_target2);
2789 af57b12a 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2790 af57b12a 2020-07-23 stsp blob1, ondisk_path, path2, sb.st_mode,
2791 af57b12a 2020-07-23 stsp a->label_orig, blob2, a->commit_id2, repo,
2792 af57b12a 2020-07-23 stsp a->progress_cb, a->progress_arg);
2794 234035bc 2019-06-01 stsp } else if (blob1) {
2795 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2796 d6c87207 2019-08-02 stsp strlen(path1));
2797 1ee397ad 2019-07-12 stsp if (ie == NULL)
2798 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2799 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2801 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2802 2b92fad7 2019-06-02 stsp path1) == -1)
2803 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2805 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2808 2b92fad7 2019-06-02 stsp goto done;
2810 2b92fad7 2019-06-02 stsp switch (status) {
2811 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2812 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2813 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2815 1ee397ad 2019-07-12 stsp goto done;
2816 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2818 2b92fad7 2019-06-02 stsp goto done;
2820 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2822 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2823 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2824 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2825 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2827 1ee397ad 2019-07-12 stsp goto done;
2829 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2831 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2832 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2833 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2835 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2836 0a22ca1a 2020-09-23 stsp * exists in the repository.
2838 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2840 0a22ca1a 2020-09-23 stsp goto done;
2841 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2842 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2843 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2845 0a22ca1a 2020-09-23 stsp goto done;
2846 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2849 0a22ca1a 2020-09-23 stsp goto done;
2851 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2854 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2855 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2857 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2858 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2861 0a22ca1a 2020-09-23 stsp goto done;
2864 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2865 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2866 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2867 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2869 1ee397ad 2019-07-12 stsp goto done;
2871 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2872 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2874 1ee397ad 2019-07-12 stsp goto done;
2879 234035bc 2019-06-01 stsp } else if (blob2) {
2880 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2881 234035bc 2019-06-01 stsp path2) == -1)
2882 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2883 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2884 d6c87207 2019-08-02 stsp strlen(path2));
2886 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2887 7f91a133 2019-12-13 stsp -1, NULL, repo);
2889 234035bc 2019-06-01 stsp goto done;
2890 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2891 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2892 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2893 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2894 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2895 1ee397ad 2019-07-12 stsp status, path2);
2896 234035bc 2019-06-01 stsp goto done;
2898 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2899 36bf999c 2020-07-23 stsp char *link_target2;
2900 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2903 36bf999c 2020-07-23 stsp goto done;
2904 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2905 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2906 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2907 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2908 36bf999c 2020-07-23 stsp free(link_target2);
2909 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2910 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2911 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2912 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2913 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2914 526a746f 2020-07-23 stsp a->progress_arg);
2916 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2917 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2920 dfe9fba0 2020-07-23 stsp goto done;
2921 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2922 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2923 054041d0 2020-06-24 stsp ondisk_path, blob2->id.sha1,
2924 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2926 234035bc 2019-06-01 stsp goto done;
2929 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2930 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2931 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2932 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2933 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2934 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
2936 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2937 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2938 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2941 234035bc 2019-06-01 stsp goto done;
2942 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2944 234035bc 2019-06-01 stsp goto done;
2945 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2946 3969253a 2020-03-07 stsp NULL, NULL, 1);
2947 3969253a 2020-03-07 stsp if (err) {
2948 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2949 3969253a 2020-03-07 stsp goto done;
2951 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2952 2b92fad7 2019-06-02 stsp if (err) {
2953 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2954 2b92fad7 2019-06-02 stsp goto done;
2956 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2957 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2958 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2963 234035bc 2019-06-01 stsp free(ondisk_path);
2964 234035bc 2019-06-01 stsp return err;
2967 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2968 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2969 234035bc 2019-06-01 stsp struct got_repository *repo;
2972 234035bc 2019-06-01 stsp static const struct got_error *
2973 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2975 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2976 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2977 234035bc 2019-06-01 stsp unsigned char status;
2978 234035bc 2019-06-01 stsp struct stat sb;
2979 234035bc 2019-06-01 stsp char *ondisk_path;
2981 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2982 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2983 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2984 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2986 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2988 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2990 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2991 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2993 234035bc 2019-06-01 stsp return err;
2994 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2995 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2997 234035bc 2019-06-01 stsp return NULL;
3000 818c7501 2019-07-11 stsp static const struct got_error *
3001 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3002 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3003 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3004 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3005 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3007 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3008 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3009 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3010 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3011 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3013 03415a1a 2019-06-02 stsp if (commit_id1) {
3014 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3015 03415a1a 2019-06-02 stsp worktree->path_prefix);
3016 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3017 03415a1a 2019-06-02 stsp goto done;
3019 69d57f3d 2020-07-31 stsp if (tree_id1) {
3020 69d57f3d 2020-07-31 stsp char *id_str;
3022 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3024 03415a1a 2019-06-02 stsp goto done;
3026 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3028 f69721c3 2019-10-21 stsp goto done;
3030 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3031 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3032 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3033 f69721c3 2019-10-21 stsp free(id_str);
3034 f69721c3 2019-10-21 stsp goto done;
3036 f69721c3 2019-10-21 stsp free(id_str);
3039 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3040 234035bc 2019-06-01 stsp worktree->path_prefix);
3042 234035bc 2019-06-01 stsp goto done;
3044 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3046 234035bc 2019-06-01 stsp goto done;
3048 234035bc 2019-06-01 stsp arg.worktree = worktree;
3049 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3050 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3051 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3052 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3053 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3054 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3055 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3056 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3057 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3058 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3059 af12c6b9 2019-06-04 stsp err = sync_err;
3061 234035bc 2019-06-01 stsp if (tree1)
3062 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3063 234035bc 2019-06-01 stsp if (tree2)
3064 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3065 f69721c3 2019-10-21 stsp free(label_orig);
3066 818c7501 2019-07-11 stsp return err;
3069 818c7501 2019-07-11 stsp const struct got_error *
3070 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3071 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3072 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3073 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3075 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3076 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3077 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3078 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
3080 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3082 818c7501 2019-07-11 stsp return err;
3084 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3086 818c7501 2019-07-11 stsp goto done;
3088 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
3089 818c7501 2019-07-11 stsp mok_arg.repo = repo;
3090 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3091 818c7501 2019-07-11 stsp &mok_arg);
3093 818c7501 2019-07-11 stsp goto done;
3095 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3096 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3098 818c7501 2019-07-11 stsp if (fileindex)
3099 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3100 818c7501 2019-07-11 stsp free(fileindex_path);
3101 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3102 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3103 234035bc 2019-06-01 stsp err = unlockerr;
3104 234035bc 2019-06-01 stsp return err;
3107 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3108 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3109 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3110 927df6b7 2019-02-10 stsp const char *status_path;
3111 927df6b7 2019-02-10 stsp size_t status_path_len;
3112 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3113 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3114 f8d1f275 2019-02-04 stsp void *status_arg;
3115 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3116 f8d1f275 2019-02-04 stsp void *cancel_arg;
3117 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3118 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
3119 f2a9dc41 2019-12-13 tracey int report_unchanged;
3120 3143d852 2020-06-25 stsp int no_ignores;
3123 f8d1f275 2019-02-04 stsp static const struct got_error *
3124 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3125 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3126 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3127 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3129 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3130 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3131 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3132 927df6b7 2019-02-10 stsp struct stat sb;
3133 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3134 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3135 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3137 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3139 98eaaa12 2019-08-03 stsp return err;
3141 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3142 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3143 98eaaa12 2019-08-03 stsp return NULL;
3145 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3146 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3147 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3149 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3150 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3151 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3153 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3154 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3155 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3156 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3157 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3160 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3161 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3164 927df6b7 2019-02-10 stsp static const struct got_error *
3165 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3166 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3168 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3169 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3170 f8d1f275 2019-02-04 stsp char *abspath;
3172 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3173 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3175 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3176 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3177 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3178 927df6b7 2019-02-10 stsp return NULL;
3180 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3181 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3182 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3183 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3185 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3186 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3187 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3190 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3191 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3192 f8d1f275 2019-02-04 stsp free(abspath);
3193 9d31a1d8 2018-03-11 stsp return err;
3196 f8d1f275 2019-02-04 stsp static const struct got_error *
3197 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3199 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3200 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3201 2ec1f75b 2019-03-26 stsp unsigned char status;
3203 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3204 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3206 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3207 927df6b7 2019-02-10 stsp return NULL;
3209 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3210 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3211 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3212 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3214 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3215 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3216 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3220 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3222 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3224 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3225 6841da00 2019-08-08 stsp free((char *)pe->path);
3226 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3230 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3232 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3234 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3235 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3236 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3237 6841da00 2019-08-08 stsp free((char *)pe->path);
3239 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3242 6841da00 2019-08-08 stsp static const struct got_error *
3243 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3245 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3246 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3247 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3248 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3249 6841da00 2019-08-08 stsp size_t linesize = 0;
3250 6841da00 2019-08-08 stsp ssize_t linelen;
3252 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3253 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3254 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3255 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3257 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3258 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3259 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3261 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3262 bd8de430 2019-10-04 stsp if (line[0] == '#')
3265 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3266 bd8de430 2019-10-04 stsp if (line[0] == '!')
3269 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3270 6841da00 2019-08-08 stsp line) == -1) {
3271 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3272 6841da00 2019-08-08 stsp goto done;
3274 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3276 6841da00 2019-08-08 stsp goto done;
3278 6841da00 2019-08-08 stsp if (ferror(f)) {
3279 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3280 6841da00 2019-08-08 stsp goto done;
3283 6841da00 2019-08-08 stsp dirpath = strdup(path);
3284 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3285 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3286 6841da00 2019-08-08 stsp goto done;
3288 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3290 6841da00 2019-08-08 stsp free(line);
3291 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3292 6841da00 2019-08-08 stsp free(dirpath);
3293 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3295 6841da00 2019-08-08 stsp return err;
3299 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3301 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3303 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3304 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3305 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3306 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3308 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3309 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3311 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3313 bd8de430 2019-10-04 stsp pattern += 3;
3315 bd8de430 2019-10-04 stsp while (*p) {
3316 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3317 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3318 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3319 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3321 bd8de430 2019-10-04 stsp while (*p == '/')
3331 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3332 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3333 6841da00 2019-08-08 stsp * ignores backwards.
3335 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3336 6841da00 2019-08-08 stsp while (pe) {
3337 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3338 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3339 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3340 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3341 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3342 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3343 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3344 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3345 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3350 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3356 6841da00 2019-08-08 stsp static const struct got_error *
3357 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3358 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3360 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3361 6841da00 2019-08-08 stsp char *ignorespath;
3362 886cec17 2019-12-15 stsp int fd = -1;
3363 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3365 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3366 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3367 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3369 886cec17 2019-12-15 stsp if (dirfd != -1) {
3370 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3371 886cec17 2019-12-15 stsp if (fd == -1) {
3372 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3373 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3374 886cec17 2019-12-15 stsp ignorespath);
3376 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3377 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3378 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3379 886cec17 2019-12-15 stsp ignorespath);
3382 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3386 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3387 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3388 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3389 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3390 886cec17 2019-12-15 stsp ignorespath);
3392 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3395 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3396 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3397 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3398 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3399 6841da00 2019-08-08 stsp free(ignorespath);
3400 6841da00 2019-08-08 stsp return err;
3403 f8d1f275 2019-02-04 stsp static const struct got_error *
3404 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3406 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3407 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3408 f8d1f275 2019-02-04 stsp char *path = NULL;
3410 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3411 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3413 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3414 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3415 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3417 f8d1f275 2019-02-04 stsp path = de->d_name;
3420 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3421 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3422 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3423 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3424 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3425 f8d1f275 2019-02-04 stsp if (parent_path[0])
3426 f8d1f275 2019-02-04 stsp free(path);
3427 b72f483a 2019-02-05 stsp return err;
3430 347d1d3e 2019-07-12 stsp static const struct got_error *
3431 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3433 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3434 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3436 3143d852 2020-06-25 stsp if (a->no_ignores)
3437 3143d852 2020-06-25 stsp return NULL;
3439 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3440 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3442 3143d852 2020-06-25 stsp return err;
3444 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3445 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3447 3143d852 2020-06-25 stsp return err;
3450 3143d852 2020-06-25 stsp static const struct got_error *
3451 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3452 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3453 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3455 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3456 abb4604f 2019-07-27 stsp struct stat sb;
3458 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3460 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3461 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3463 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3464 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3465 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3466 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3467 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3468 abb4604f 2019-07-27 stsp return NULL;
3471 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3472 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3473 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3475 abb4604f 2019-07-27 stsp return NULL;
3478 3143d852 2020-06-25 stsp static const struct got_error *
3479 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3480 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3482 3143d852 2020-06-25 stsp const struct got_error *err;
3483 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3485 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3486 3143d852 2020-06-25 stsp ".cvsignore");
3488 3143d852 2020-06-25 stsp return err;
3490 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3491 3143d852 2020-06-25 stsp ".gitignore");
3493 3143d852 2020-06-25 stsp return err;
3495 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3496 3143d852 2020-06-25 stsp if (err) {
3497 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3498 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3499 3143d852 2020-06-25 stsp return err;
3501 3143d852 2020-06-25 stsp for (;;) {
3502 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3503 3143d852 2020-06-25 stsp ".cvsignore");
3506 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3507 3143d852 2020-06-25 stsp ".gitignore");
3510 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3511 3143d852 2020-06-25 stsp if (err) {
3512 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3513 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3516 b737c85a 2020-06-26 stsp free(parent_path);
3517 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3518 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3521 b737c85a 2020-06-26 stsp free(parent_path);
3522 b737c85a 2020-06-26 stsp free(next_parent_path);
3523 3143d852 2020-06-25 stsp return err;
3526 abb4604f 2019-07-27 stsp static const struct got_error *
3527 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3528 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3529 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3530 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3531 f2a9dc41 2019-12-13 tracey int report_unchanged)
3533 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3534 6fc93f37 2019-12-13 stsp int fd = -1;
3535 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3536 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3537 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3539 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3541 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3542 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3543 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3545 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3546 6fc93f37 2019-12-13 stsp if (fd == -1) {
3547 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3548 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3549 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3551 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3552 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3553 f2a9dc41 2019-12-13 tracey report_unchanged);
3555 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3556 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3557 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3558 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3559 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3560 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3561 abb4604f 2019-07-27 stsp arg.status_path = path;
3562 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3563 abb4604f 2019-07-27 stsp arg.repo = repo;
3564 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3565 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3566 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3567 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3568 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3569 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3570 022fae89 2019-12-06 tracey if (!no_ignores) {
3571 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3572 3143d852 2020-06-25 stsp worktree->root_path, path);
3574 3143d852 2020-06-25 stsp goto done;
3576 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3577 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3580 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3581 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
3582 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3583 927df6b7 2019-02-10 stsp free(ondisk_path);
3584 347d1d3e 2019-07-12 stsp return err;
3587 347d1d3e 2019-07-12 stsp const struct got_error *
3588 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3589 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3590 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3591 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3593 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3594 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3595 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3596 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3598 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3600 347d1d3e 2019-07-12 stsp return err;
3602 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3603 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3604 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3608 f8d1f275 2019-02-04 stsp free(fileindex_path);
3609 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3610 f8d1f275 2019-02-04 stsp return err;
3613 6c7ab921 2019-03-18 stsp const struct got_error *
3614 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3615 6c7ab921 2019-03-18 stsp const char *arg)
3617 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3618 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3619 6c7ab921 2019-03-18 stsp size_t len;
3620 00bb5ea0 2020-07-23 stsp struct stat sb;
3622 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3624 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3625 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3626 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3628 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3629 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3630 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3631 00bb5ea0 2020-07-23 stsp goto done;
3634 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3636 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3637 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3638 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3639 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3641 00bb5ea0 2020-07-23 stsp char *abspath = NULL;
3642 00bb5ea0 2020-07-23 stsp char canonpath[PATH_MAX];
3643 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3644 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3645 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3646 00bb5ea0 2020-07-23 stsp goto done;
3650 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3651 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3653 d0710d08 2019-07-22 stsp goto done;
3654 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3655 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3656 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3657 00bb5ea0 2020-07-23 stsp goto done;
3660 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3661 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3662 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3663 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3664 00bb5ea0 2020-07-23 stsp goto done;
3666 00bb5ea0 2020-07-23 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3667 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3668 00bb5ea0 2020-07-23 stsp goto done;
3673 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3674 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3675 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3676 6c7ab921 2019-03-18 stsp goto done;
3679 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3680 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3681 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3683 f6d88e1a 2019-05-29 stsp goto done;
3685 f6d88e1a 2019-05-29 stsp path = strdup("");
3686 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3687 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3688 f6d88e1a 2019-05-29 stsp goto done;
3692 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3693 6c7ab921 2019-03-18 stsp len = strlen(path);
3694 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3695 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3699 6c7ab921 2019-03-18 stsp free(resolved);
3700 d0710d08 2019-07-22 stsp free(cwd);
3701 6c7ab921 2019-03-18 stsp if (err == NULL)
3702 6c7ab921 2019-03-18 stsp *wt_path = path;
3704 6c7ab921 2019-03-18 stsp free(path);
3705 d00136be 2019-03-26 stsp return err;
3708 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3709 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3710 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3711 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3712 4e68cba3 2019-11-23 stsp void *progress_arg;
3713 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3716 4e68cba3 2019-11-23 stsp static const struct got_error *
3717 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3718 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3719 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3720 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3722 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3723 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3724 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3725 6d022e97 2019-08-04 stsp struct stat sb;
3726 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3728 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3729 dbb83fbd 2019-12-12 stsp relpath) == -1)
3730 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3732 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3734 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3735 12463d8b 2019-12-13 stsp de_name, a->repo);
3737 dbb83fbd 2019-12-12 stsp goto done;
3738 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3739 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3740 dbb83fbd 2019-12-12 stsp goto done;
3741 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3743 dbb83fbd 2019-12-12 stsp goto done;
3746 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3747 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3748 dbb83fbd 2019-12-12 stsp goto done;
3751 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3753 4e68cba3 2019-11-23 stsp goto done;
3754 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3755 3969253a 2020-03-07 stsp if (err) {
3756 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3757 3969253a 2020-03-07 stsp goto done;
3759 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3760 07f5b47a 2019-06-02 stsp if (err) {
3761 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3762 4e68cba3 2019-11-23 stsp goto done;
3765 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3767 dbb83fbd 2019-12-12 stsp return err;
3768 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3769 dbb83fbd 2019-12-12 stsp return NULL;
3770 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3773 d00136be 2019-03-26 stsp const struct got_error *
3774 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3775 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3776 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3777 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3779 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3780 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3781 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3782 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3783 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3785 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3787 d00136be 2019-03-26 stsp return err;
3789 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3791 d00136be 2019-03-26 stsp goto done;
3793 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3794 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3795 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3796 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3797 4e68cba3 2019-11-23 stsp saa.repo = repo;
3799 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3800 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3801 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3805 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3806 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3807 af12c6b9 2019-06-04 stsp err = sync_err;
3809 fb399478 2019-07-12 stsp free(fileindex_path);
3810 d00136be 2019-03-26 stsp if (fileindex)
3811 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3812 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3813 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3814 d00136be 2019-03-26 stsp err = unlockerr;
3815 6c7ab921 2019-03-18 stsp return err;
3818 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3819 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3820 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3821 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3822 f2a9dc41 2019-12-13 tracey void *progress_arg;
3823 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3824 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3825 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3826 766841c2 2020-08-13 stsp const char *status_codes;
3829 f2a9dc41 2019-12-13 tracey static const struct got_error *
3830 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3831 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3832 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3833 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3835 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3836 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3837 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3838 17ed4618 2019-06-02 stsp struct stat sb;
3839 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
3841 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3842 17ed4618 2019-06-02 stsp if (ie == NULL)
3843 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3845 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3846 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3847 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3848 9acbc4fa 2019-08-03 stsp return NULL;
3849 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3852 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3853 f2a9dc41 2019-12-13 tracey relpath) == -1)
3854 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3856 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3859 f2a9dc41 2019-12-13 tracey goto done;
3861 766841c2 2020-08-13 stsp if (a->status_codes) {
3862 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
3864 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
3865 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
3868 766841c2 2020-08-13 stsp if (i == ncodes) {
3869 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
3870 766841c2 2020-08-13 stsp free(ondisk_path);
3871 766841c2 2020-08-13 stsp return NULL;
3873 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
3874 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
3875 766841c2 2020-08-13 stsp static char msg[64];
3876 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
3877 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
3878 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
3879 766841c2 2020-08-13 stsp goto done;
3883 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3884 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3885 f2a9dc41 2019-12-13 tracey goto done;
3886 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3887 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3888 f2a9dc41 2019-12-13 tracey goto done;
3890 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3891 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3892 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3893 f2a9dc41 2019-12-13 tracey goto done;
3897 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3898 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3899 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3900 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3901 12463d8b 2019-12-13 stsp ondisk_path);
3902 12463d8b 2019-12-13 stsp goto done;
3904 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3905 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3906 12463d8b 2019-12-13 stsp goto done;
3909 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3911 15341bfd 2020-03-05 tracey if (parent == NULL) {
3912 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3913 15341bfd 2020-03-05 tracey goto done;
3915 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3916 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3917 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3918 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3919 15341bfd 2020-03-05 tracey parent);
3922 15341bfd 2020-03-05 tracey parent = dirname(parent);
3923 15341bfd 2020-03-05 tracey if (parent == NULL) {
3924 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3925 15341bfd 2020-03-05 tracey goto done;
3930 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3932 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3933 f2a9dc41 2019-12-13 tracey if (err)
3934 f2a9dc41 2019-12-13 tracey return err;
3935 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3936 f2a9dc41 2019-12-13 tracey return NULL;
3937 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3938 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3941 2ec1f75b 2019-03-26 stsp const struct got_error *
3942 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3943 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3944 766841c2 2020-08-13 stsp const char *status_codes,
3945 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3946 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3948 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3949 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3950 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3951 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3952 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3954 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3956 2ec1f75b 2019-03-26 stsp return err;
3958 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3960 2ec1f75b 2019-03-26 stsp goto done;
3962 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3963 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3964 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3965 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3966 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3967 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3968 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3969 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
3971 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3972 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3973 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3977 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3978 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3979 af12c6b9 2019-06-04 stsp err = sync_err;
3981 fb399478 2019-07-12 stsp free(fileindex_path);
3982 2ec1f75b 2019-03-26 stsp if (fileindex)
3983 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3984 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3985 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3986 2ec1f75b 2019-03-26 stsp err = unlockerr;
3987 33aa809d 2019-08-08 stsp return err;
3990 33aa809d 2019-08-08 stsp static const struct got_error *
3991 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3993 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3994 33aa809d 2019-08-08 stsp char *line = NULL;
3995 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3996 33aa809d 2019-08-08 stsp ssize_t linelen;
3998 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3999 33aa809d 2019-08-08 stsp if (linelen == -1) {
4000 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4001 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4002 33aa809d 2019-08-08 stsp goto done;
4004 33aa809d 2019-08-08 stsp return NULL;
4006 33aa809d 2019-08-08 stsp if (outfile) {
4007 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4008 33aa809d 2019-08-08 stsp if (n != linelen) {
4009 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4010 33aa809d 2019-08-08 stsp goto done;
4013 33aa809d 2019-08-08 stsp if (rejectfile) {
4014 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4015 33aa809d 2019-08-08 stsp if (n != linelen)
4016 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4019 33aa809d 2019-08-08 stsp free(line);
4020 2ec1f75b 2019-03-26 stsp return err;
4023 33aa809d 2019-08-08 stsp static const struct got_error *
4024 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4026 33aa809d 2019-08-08 stsp char *line = NULL;
4027 33aa809d 2019-08-08 stsp size_t linesize = 0;
4028 33aa809d 2019-08-08 stsp ssize_t linelen;
4030 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4031 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4032 500467ff 2019-09-25 hiltjo if (ferror(f))
4033 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4034 500467ff 2019-09-25 hiltjo return NULL;
4036 33aa809d 2019-08-08 stsp free(line);
4037 33aa809d 2019-08-08 stsp return NULL;
4040 33aa809d 2019-08-08 stsp static const struct got_error *
4041 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4042 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4043 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4045 33aa809d 2019-08-08 stsp const struct got_error *err;
4047 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4048 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4049 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4051 33aa809d 2019-08-08 stsp return err;
4052 33aa809d 2019-08-08 stsp (*line_cur1)++;
4054 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4055 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4056 33aa809d 2019-08-08 stsp if (rejectfile)
4057 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4059 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4061 33aa809d 2019-08-08 stsp return err;
4062 33aa809d 2019-08-08 stsp (*line_cur2)++;
4064 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4065 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4066 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4068 33aa809d 2019-08-08 stsp return err;
4069 33aa809d 2019-08-08 stsp (*line_cur2)++;
4071 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4072 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4073 33aa809d 2019-08-08 stsp if (rejectfile)
4074 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4076 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4078 33aa809d 2019-08-08 stsp return err;
4079 33aa809d 2019-08-08 stsp (*line_cur1)++;
4082 f1e81a05 2019-08-10 stsp return NULL;
4085 f1e81a05 2019-08-10 stsp static const struct got_error *
4086 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4087 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4089 f1e81a05 2019-08-10 stsp const struct got_error *err;
4091 f1e81a05 2019-08-10 stsp if (outfile) {
4092 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4093 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4094 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4096 f1e81a05 2019-08-10 stsp return err;
4097 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4100 f1e81a05 2019-08-10 stsp if (rejectfile) {
4101 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4102 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4103 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4105 f1e81a05 2019-08-10 stsp return err;
4106 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4110 33aa809d 2019-08-08 stsp return NULL;
4113 33aa809d 2019-08-08 stsp static const struct got_error *
4114 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
4115 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
4116 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
4117 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
4118 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4120 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4121 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
4122 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
4123 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
4124 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
4125 33aa809d 2019-08-08 stsp long pos1, pos2;
4126 33aa809d 2019-08-08 stsp FILE *hunkfile;
4128 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4130 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
4131 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
4132 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
4134 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
4135 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
4137 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
4138 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
4140 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, 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(f2, pos2, SEEK_SET) == -1) {
4145 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4146 33aa809d 2019-08-08 stsp goto done;
4148 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4149 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4150 33aa809d 2019-08-08 stsp goto done;
4153 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4154 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
4156 33aa809d 2019-08-08 stsp goto done;
4158 33aa809d 2019-08-08 stsp switch (*choice) {
4159 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
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, outfile, rejectfile);
4163 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4164 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4165 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4167 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4170 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4174 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4175 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4176 33aa809d 2019-08-08 stsp return err;
4179 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4180 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4181 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4182 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4183 1f1abb7e 2019-08-08 stsp void *progress_arg;
4184 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4185 33aa809d 2019-08-08 stsp void *patch_arg;
4186 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4189 e20a8b6f 2019-06-04 stsp static const struct got_error *
4190 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4191 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4192 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4193 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4194 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4196 33aa809d 2019-08-08 stsp const struct got_error *err;
4197 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4198 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4199 1ebedb77 2019-10-19 stsp int fd2 = -1;
4200 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4201 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4202 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4203 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
4204 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
4205 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
4206 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
4207 33aa809d 2019-08-08 stsp struct got_diff_change *change;
4208 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
4209 33aa809d 2019-08-08 stsp int n = 0;
4211 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4213 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4215 33aa809d 2019-08-08 stsp return err;
4217 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4218 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4219 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4220 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4221 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4222 fa3cef63 2020-07-23 stsp goto done;
4224 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4225 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4226 fa3cef63 2020-07-23 stsp if (link_len == -1)
4227 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4228 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4229 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4232 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4233 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4234 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4235 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4236 fa3cef63 2020-07-23 stsp goto done;
4238 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4239 fa3cef63 2020-07-23 stsp sizeof(link_target));
4240 fa3cef63 2020-07-23 stsp if (link_len == -1)
4241 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4242 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4243 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4246 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4247 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4248 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4249 fa3cef63 2020-07-23 stsp goto done;
4252 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4253 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4254 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4255 fa3cef63 2020-07-23 stsp goto done;
4260 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4261 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4262 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4263 fa3cef63 2020-07-23 stsp goto done;
4265 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4266 fa3cef63 2020-07-23 stsp if (n != link_len) {
4267 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4268 fa3cef63 2020-07-23 stsp goto done;
4270 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4271 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4272 fa3cef63 2020-07-23 stsp goto done;
4274 fa3cef63 2020-07-23 stsp rewind(f2);
4277 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4279 33aa809d 2019-08-08 stsp goto done;
4281 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4283 33aa809d 2019-08-08 stsp goto done;
4285 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4287 33aa809d 2019-08-08 stsp goto done;
4289 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
4290 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
4291 33aa809d 2019-08-08 stsp goto done;
4294 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
4295 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
4297 33aa809d 2019-08-08 stsp goto done;
4299 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4301 33aa809d 2019-08-08 stsp goto done;
4303 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4304 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4305 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4306 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4307 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
4308 33aa809d 2019-08-08 stsp int choice;
4309 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
4310 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
4311 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
4312 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4313 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4314 e635744c 2019-08-08 stsp patch_cb, patch_arg);
4316 33aa809d 2019-08-08 stsp goto done;
4317 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4318 33aa809d 2019-08-08 stsp have_content = 1;
4319 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4322 1ebedb77 2019-10-19 stsp if (have_content) {
4323 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4324 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4325 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4327 1ebedb77 2019-10-19 stsp goto done;
4329 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4330 fa3cef63 2020-07-23 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
4331 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("chmod", path2);
4332 fa3cef63 2020-07-23 stsp goto done;
4337 33aa809d 2019-08-08 stsp free(id_str);
4339 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4340 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4341 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4342 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4343 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4344 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4345 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4346 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4347 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4348 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4349 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4350 33aa809d 2019-08-08 stsp if (err || !have_content) {
4351 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4352 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4353 33aa809d 2019-08-08 stsp free(*path_outfile);
4354 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4356 33aa809d 2019-08-08 stsp free(args);
4358 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
4361 33aa809d 2019-08-08 stsp if (changes)
4362 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
4363 33aa809d 2019-08-08 stsp free(path1);
4364 33aa809d 2019-08-08 stsp return err;
4367 33aa809d 2019-08-08 stsp static const struct got_error *
4368 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4369 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4370 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4371 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4373 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4374 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4375 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4376 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4377 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4378 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4379 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4380 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4381 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4382 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4384 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4385 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4386 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4387 d3bcc3d1 2019-08-08 stsp return NULL;
4389 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4390 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4391 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4393 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4394 65084dad 2019-08-08 stsp if (ie == NULL)
4395 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4397 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4398 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4399 a129376b 2019-03-28 stsp if (err) {
4400 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4401 a129376b 2019-03-28 stsp goto done;
4402 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4403 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4404 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4405 e20a8b6f 2019-06-04 stsp goto done;
4408 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4409 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4410 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4411 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4412 a129376b 2019-03-28 stsp goto done;
4415 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4416 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4417 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4418 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4419 a129376b 2019-03-28 stsp goto done;
4422 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4423 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4424 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4425 a129376b 2019-03-28 stsp goto done;
4430 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4431 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4432 a9fa2909 2019-07-27 stsp if (err) {
4433 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4434 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4435 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4436 a9fa2909 2019-07-27 stsp goto done;
4438 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4440 a9fa2909 2019-07-27 stsp goto done;
4442 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4444 a9fa2909 2019-07-27 stsp goto done;
4446 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4447 1233e6b6 2020-10-19 stsp free(te_name);
4448 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4449 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4450 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4451 a9fa2909 2019-07-27 stsp goto done;
4455 a129376b 2019-03-28 stsp switch (status) {
4456 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4457 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4458 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4459 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4460 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4462 33aa809d 2019-08-08 stsp goto done;
4463 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4466 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4467 1f1abb7e 2019-08-08 stsp ie->path);
4469 1ee397ad 2019-07-12 stsp goto done;
4470 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4472 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4473 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4474 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4475 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4476 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4478 33aa809d 2019-08-08 stsp goto done;
4479 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4482 33aa809d 2019-08-08 stsp /* fall through */
4483 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4484 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4485 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4486 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4487 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4488 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4489 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4490 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4491 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4493 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4494 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4495 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4497 65084dad 2019-08-08 stsp goto done;
4499 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4500 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4501 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4502 a129376b 2019-03-28 stsp goto done;
4505 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4506 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4507 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4508 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4509 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4510 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4511 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4513 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4514 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4515 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4516 369fd7e5 2020-07-23 stsp path_content);
4519 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4520 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4521 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4522 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4524 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4525 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4526 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4527 369fd7e5 2020-07-23 stsp goto done;
4531 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4532 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4533 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4534 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4535 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4536 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4538 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4540 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4541 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4542 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4543 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4546 a129376b 2019-03-28 stsp goto done;
4547 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4548 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4549 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4550 054041d0 2020-06-24 stsp ondisk_path, blob->id.sha1,
4551 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4553 2e1fa222 2020-07-23 stsp goto done;
4555 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4556 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4557 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4566 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4567 33aa809d 2019-08-08 stsp free(path_content);
4568 e20a8b6f 2019-06-04 stsp free(parent_path);
4569 a129376b 2019-03-28 stsp free(tree_path);
4571 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4573 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4574 a129376b 2019-03-28 stsp free(tree_id);
4575 e20a8b6f 2019-06-04 stsp return err;
4578 e20a8b6f 2019-06-04 stsp const struct got_error *
4579 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4580 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4581 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4582 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4583 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4585 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4586 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4587 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4588 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4589 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4590 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4592 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4594 e20a8b6f 2019-06-04 stsp return err;
4596 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4598 e20a8b6f 2019-06-04 stsp goto done;
4600 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4601 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4602 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4603 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4604 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4605 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4606 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4607 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4608 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4609 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4613 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4614 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4615 e20a8b6f 2019-06-04 stsp err = sync_err;
4617 fb399478 2019-07-12 stsp free(fileindex_path);
4618 a129376b 2019-03-28 stsp if (fileindex)
4619 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4620 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4621 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4622 a129376b 2019-03-28 stsp err = unlockerr;
4623 c4296144 2019-05-09 stsp return err;
4626 cf066bf8 2019-05-09 stsp static void
4627 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4629 24519714 2019-05-09 stsp free(ct->path);
4630 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4631 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4632 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4633 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4634 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4635 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4639 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4640 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4641 24519714 2019-05-09 stsp struct got_repository *repo;
4642 24519714 2019-05-09 stsp struct got_worktree *worktree;
4643 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4644 5f8a88c6 2019-08-03 stsp int have_staged_files;
4645 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4648 c4296144 2019-05-09 stsp static const struct got_error *
4649 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4650 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4651 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4652 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4654 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4655 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4656 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4657 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4658 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4659 768aea60 2019-05-09 stsp struct stat sb;
4661 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4662 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4663 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4664 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4665 5f8a88c6 2019-08-03 stsp return NULL;
4667 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4668 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4670 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4671 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4672 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4673 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4674 5f8a88c6 2019-08-03 stsp return NULL;
4677 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4678 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4679 036813ee 2019-05-09 stsp goto done;
4681 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4682 036813ee 2019-05-09 stsp parent_path = strdup("");
4683 69960a46 2019-05-09 stsp if (parent_path == NULL)
4684 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4686 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4688 69960a46 2019-05-09 stsp return err;
4691 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4692 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4693 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4694 c4296144 2019-05-09 stsp goto done;
4697 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4698 768aea60 2019-05-09 stsp relpath) == -1) {
4699 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4700 768aea60 2019-05-09 stsp goto done;
4703 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4704 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4705 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4706 0aeb8099 2020-07-23 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4707 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4708 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4709 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4710 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4712 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4713 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4716 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4717 0aeb8099 2020-07-23 stsp goto done;
4719 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4720 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4721 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4722 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4723 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4724 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4725 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4726 12463d8b 2019-12-13 stsp ct->ondisk_path);
4727 12463d8b 2019-12-13 stsp goto done;
4729 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4730 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4731 768aea60 2019-05-09 stsp goto done;
4733 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4736 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4737 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4738 44d03001 2019-05-09 stsp relpath) == -1) {
4739 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4740 44d03001 2019-05-09 stsp goto done;
4743 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4744 35213c7c 2020-07-23 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4745 35213c7c 2020-07-23 stsp int is_bad_symlink;
4746 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4747 35213c7c 2020-07-23 stsp ssize_t target_len;
4748 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4749 35213c7c 2020-07-23 stsp sizeof(target_path));
4750 35213c7c 2020-07-23 stsp if (target_len == -1) {
4751 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4752 35213c7c 2020-07-23 stsp ct->ondisk_path);
4753 35213c7c 2020-07-23 stsp goto done;
4755 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4756 35213c7c 2020-07-23 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4758 35213c7c 2020-07-23 stsp goto done;
4759 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4760 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4761 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4762 35213c7c 2020-07-23 stsp goto done;
4767 cf066bf8 2019-05-09 stsp ct->status = status;
4768 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4769 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4770 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4771 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4772 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4773 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4774 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4775 b416585c 2019-05-13 stsp goto done;
4777 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4778 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4779 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4780 f0b75401 2019-08-03 stsp goto done;
4783 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4784 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4785 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4786 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4787 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4788 036813ee 2019-05-09 stsp goto done;
4791 24519714 2019-05-09 stsp ct->path = strdup(path);
4792 24519714 2019-05-09 stsp if (ct->path == NULL) {
4793 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4794 24519714 2019-05-09 stsp goto done;
4796 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4798 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4799 ed175427 2019-05-09 stsp free_commitable(ct);
4800 24519714 2019-05-09 stsp free(parent_path);
4801 036813ee 2019-05-09 stsp free(path);
4802 a129376b 2019-03-28 stsp return err;
4805 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4806 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4807 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4808 036813ee 2019-05-09 stsp struct got_repository *);
4810 ed175427 2019-05-09 stsp static const struct got_error *
4811 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4812 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4813 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4814 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4815 afa376bf 2019-05-09 stsp struct got_repository *repo)
4817 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4818 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4819 036813ee 2019-05-09 stsp char *subpath;
4821 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4822 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4823 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4825 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4827 ed175427 2019-05-09 stsp return err;
4829 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4830 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4831 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4832 036813ee 2019-05-09 stsp free(subpath);
4833 036813ee 2019-05-09 stsp return err;
4836 036813ee 2019-05-09 stsp static const struct got_error *
4837 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4839 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4840 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4842 036813ee 2019-05-09 stsp *match = 0;
4844 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4845 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4846 0f63689d 2019-05-10 stsp return NULL;
4849 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4851 0f63689d 2019-05-10 stsp return err;
4852 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4853 036813ee 2019-05-09 stsp free(ct_parent_path);
4854 036813ee 2019-05-09 stsp return err;
4857 768aea60 2019-05-09 stsp static mode_t
4858 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4860 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
4861 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
4863 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4866 036813ee 2019-05-09 stsp static const struct got_error *
4867 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4868 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4870 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4872 036813ee 2019-05-09 stsp *new_te = NULL;
4874 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4876 036813ee 2019-05-09 stsp goto done;
4878 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4880 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4881 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4882 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4884 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4886 036813ee 2019-05-09 stsp if (err && *new_te) {
4887 56e0773d 2019-11-28 stsp free(*new_te);
4888 036813ee 2019-05-09 stsp *new_te = NULL;
4890 036813ee 2019-05-09 stsp return err;
4893 036813ee 2019-05-09 stsp static const struct got_error *
4894 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4895 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4897 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4898 102b254e 2020-10-19 stsp char *ct_name = NULL;
4900 036813ee 2019-05-09 stsp *new_te = NULL;
4902 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4903 036813ee 2019-05-09 stsp if (*new_te == NULL)
4904 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4906 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
4908 036813ee 2019-05-09 stsp goto done;
4909 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4910 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4911 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4912 036813ee 2019-05-09 stsp goto done;
4915 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4917 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4918 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4919 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4921 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4923 102b254e 2020-10-19 stsp free(ct_name);
4924 036813ee 2019-05-09 stsp if (err && *new_te) {
4925 56e0773d 2019-11-28 stsp free(*new_te);
4926 036813ee 2019-05-09 stsp *new_te = NULL;
4928 036813ee 2019-05-09 stsp return err;
4931 036813ee 2019-05-09 stsp static const struct got_error *
4932 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
4933 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
4935 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4936 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
4938 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4940 036813ee 2019-05-09 stsp return err;
4941 036813ee 2019-05-09 stsp if (new_pe == NULL)
4942 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
4943 036813ee 2019-05-09 stsp return NULL;
4946 afa376bf 2019-05-09 stsp static const struct got_error *
4947 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
4948 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
4950 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
4951 5f8a88c6 2019-08-03 stsp unsigned char status;
4953 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
4954 afa376bf 2019-05-09 stsp ct_path++;
4956 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4957 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
4959 5f8a88c6 2019-08-03 stsp status = ct->status;
4961 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4962 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4965 036813ee 2019-05-09 stsp static const struct got_error *
4966 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4967 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4969 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4970 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4971 44d03001 2019-05-09 stsp char *te_path;
4973 44d03001 2019-05-09 stsp *modified = 0;
4975 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4976 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4977 44d03001 2019-05-09 stsp te->name) == -1)
4978 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4980 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4981 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4982 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4983 44d03001 2019-05-09 stsp strlen(te_path));
4984 44d03001 2019-05-09 stsp if (*modified)
4988 44d03001 2019-05-09 stsp free(te_path);
4989 44d03001 2019-05-09 stsp return err;
4992 44d03001 2019-05-09 stsp static const struct got_error *
4993 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4994 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4995 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4997 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4998 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5000 036813ee 2019-05-09 stsp *ctp = NULL;
5002 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5003 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5004 036813ee 2019-05-09 stsp char *ct_name = NULL;
5005 036813ee 2019-05-09 stsp int path_matches;
5007 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5008 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5009 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5010 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5013 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5014 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5018 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5021 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5023 036813ee 2019-05-09 stsp return err;
5024 036813ee 2019-05-09 stsp if (!path_matches)
5027 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5029 d34b633e 2020-10-19 stsp return err;
5031 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5032 d34b633e 2020-10-19 stsp free(ct_name);
5035 d34b633e 2020-10-19 stsp free(ct_name);
5037 036813ee 2019-05-09 stsp *ctp = ct;
5041 2b496619 2019-07-10 stsp return err;
5044 2b496619 2019-07-10 stsp static const struct got_error *
5045 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5046 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5047 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5048 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5049 2b496619 2019-07-10 stsp struct got_repository *repo)
5051 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5052 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5053 2b496619 2019-07-10 stsp char *subtree_path;
5054 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5055 ba580f68 2020-03-22 stsp int nentries;
5057 2b496619 2019-07-10 stsp *new_tep = NULL;
5059 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5060 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5061 2b496619 2019-07-10 stsp child_path) == -1)
5062 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5064 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5065 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5066 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5067 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5069 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5070 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5071 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5072 2b496619 2019-07-10 stsp goto done;
5074 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5075 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5076 2b496619 2019-07-10 stsp if (err) {
5077 56e0773d 2019-11-28 stsp free(new_te);
5078 2b496619 2019-07-10 stsp goto done;
5080 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5083 2b496619 2019-07-10 stsp free(subtree_path);
5084 2b496619 2019-07-10 stsp if (err == NULL)
5085 2b496619 2019-07-10 stsp *new_tep = new_te;
5086 036813ee 2019-05-09 stsp return err;
5089 036813ee 2019-05-09 stsp static const struct got_error *
5090 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5091 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5092 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5093 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5094 036813ee 2019-05-09 stsp struct got_repository *repo)
5096 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5097 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5098 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5099 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5101 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5102 ba580f68 2020-03-22 stsp *nentries = 0;
5104 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5105 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5106 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5107 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5109 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5110 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5111 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5114 f2b0a8b0 2020-07-31 stsp if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5115 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
5118 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5119 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5121 036813ee 2019-05-09 stsp goto done;
5123 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5124 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5125 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5127 036813ee 2019-05-09 stsp goto done;
5128 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5130 afa376bf 2019-05-09 stsp goto done;
5131 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5132 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5134 2f51b5b3 2019-05-09 stsp goto done;
5135 ba580f68 2020-03-22 stsp (*nentries)++;
5137 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5138 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5139 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5140 2b496619 2019-07-10 stsp == NULL) {
5141 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5142 2b496619 2019-07-10 stsp child_path, path_base_tree,
5143 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5146 2b496619 2019-07-10 stsp goto done;
5147 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5149 2b496619 2019-07-10 stsp goto done;
5150 ba580f68 2020-03-22 stsp (*nentries)++;
5155 2f51b5b3 2019-05-09 stsp if (base_tree) {
5156 56e0773d 2019-11-28 stsp int i, nbase_entries;
5157 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5158 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5159 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5160 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5162 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5163 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5164 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5165 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5167 63c5ca5d 2019-08-24 stsp goto done;
5168 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5170 63c5ca5d 2019-08-24 stsp goto done;
5171 ba580f68 2020-03-22 stsp (*nentries)++;
5175 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5176 44d03001 2019-05-09 stsp int modified;
5177 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5179 036813ee 2019-05-09 stsp goto done;
5180 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5181 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5183 2f51b5b3 2019-05-09 stsp goto done;
5184 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5185 44d03001 2019-05-09 stsp if (modified) {
5186 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5187 ba580f68 2020-03-22 stsp int nsubentries;
5188 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5189 ba580f68 2020-03-22 stsp &nsubentries, te,
5190 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5191 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5193 44d03001 2019-05-09 stsp goto done;
5194 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5195 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5196 ba580f68 2020-03-22 stsp free(new_id);
5199 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5200 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5201 56e0773d 2019-11-28 stsp free(new_id);
5203 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5205 036813ee 2019-05-09 stsp goto done;
5206 ba580f68 2020-03-22 stsp (*nentries)++;
5210 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5211 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5213 f66c734c 2019-09-22 stsp goto done;
5215 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5216 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5217 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5218 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5219 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5220 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5222 2f51b5b3 2019-05-09 stsp goto done;
5223 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5225 2f51b5b3 2019-05-09 stsp goto done;
5226 ba580f68 2020-03-22 stsp (*nentries)++;
5228 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5229 b416585c 2019-05-13 stsp status_arg);
5231 afa376bf 2019-05-09 stsp goto done;
5233 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5234 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5236 2f51b5b3 2019-05-09 stsp goto done;
5237 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5239 2f51b5b3 2019-05-09 stsp goto done;
5240 ba580f68 2020-03-22 stsp (*nentries)++;
5245 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5246 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5248 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5249 2e1fa222 2020-07-23 stsp return err;
5252 2e1fa222 2020-07-23 stsp static const struct got_error *
5253 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
5254 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
5255 72fd46fa 2019-09-06 stsp int have_staged_files)
5257 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5258 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5260 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5261 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5262 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5264 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5266 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5267 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5268 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5269 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5270 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5271 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5272 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5273 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5274 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
5275 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5276 72fd46fa 2019-09-06 stsp !have_staged_files);
5278 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5279 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
5280 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5281 72fd46fa 2019-09-06 stsp !have_staged_files);
5283 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5286 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
5287 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
5288 3969253a 2020-03-07 stsp if (err) {
5289 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5292 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5293 3969253a 2020-03-07 stsp if (err) {
5294 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5299 d56d26ce 2019-05-10 stsp return err;
5303 d56d26ce 2019-05-10 stsp static const struct got_error *
5304 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5305 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5306 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5307 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5308 735ef5ac 2019-08-03 stsp int ood_errcode)
5310 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5311 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5313 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5314 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5315 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5316 1a36436d 2019-06-10 stsp return NULL;
5318 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5319 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5321 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5322 735ef5ac 2019-08-03 stsp in_repo_path);
5323 9bead371 2019-07-28 stsp if (err) {
5324 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5325 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5326 1a36436d 2019-06-10 stsp goto done;
5327 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5328 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5330 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5331 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5332 735ef5ac 2019-08-03 stsp in_repo_path);
5333 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5334 1a36436d 2019-06-10 stsp goto done;
5335 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5339 1a36436d 2019-06-10 stsp return err;
5342 c4296144 2019-05-09 stsp const struct got_error *
5343 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5344 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5345 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5346 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5347 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5348 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5349 afa376bf 2019-05-09 stsp struct got_repository *repo)
5351 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5352 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5353 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5354 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5355 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5356 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5357 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5358 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5359 ba580f68 2020-03-22 stsp int nentries;
5360 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5361 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5362 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5364 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5366 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
5368 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5370 588edf97 2019-05-10 stsp goto done;
5372 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5374 588edf97 2019-05-10 stsp goto done;
5376 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5377 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5382 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5383 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5387 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5388 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5389 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5390 cf066bf8 2019-05-09 stsp char *ondisk_path;
5392 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5393 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5394 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5397 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5398 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5399 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5402 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5403 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5404 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5405 cf066bf8 2019-05-09 stsp goto done;
5407 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5408 2e1fa222 2020-07-23 stsp free(ondisk_path);
5410 cf066bf8 2019-05-09 stsp goto done;
5413 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5414 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5415 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5417 036813ee 2019-05-09 stsp goto done;
5419 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5421 de18fc63 2019-05-09 stsp goto done;
5422 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5423 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5424 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5425 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5426 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5427 33ad4cbe 2019-05-12 jcs free(logmsg);
5429 9d40349a 2019-05-09 stsp goto done;
5431 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5432 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5433 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5434 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5435 09f5bd90 2019-05-09 stsp goto done;
5437 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5438 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5440 09f5bd90 2019-05-09 stsp goto done;
5441 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5443 ebf99748 2019-05-09 stsp goto done;
5444 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5445 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5446 09f5bd90 2019-05-09 stsp goto done;
5448 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5449 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5451 f2c16586 2019-05-09 stsp goto done;
5452 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5454 f2c16586 2019-05-09 stsp goto done;
5456 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5458 09f5bd90 2019-05-09 stsp goto done;
5460 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5462 ebf99748 2019-05-09 stsp goto done;
5464 588edf97 2019-05-10 stsp if (head_tree)
5465 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5466 588edf97 2019-05-10 stsp if (head_commit)
5467 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5468 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5469 2f17228e 2019-05-12 stsp if (head_ref2) {
5470 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5471 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5472 2f17228e 2019-05-12 stsp err = unlockerr;
5473 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5475 39cd0ff6 2019-07-12 stsp return err;
5478 5c1e53bc 2019-07-28 stsp static const struct got_error *
5479 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5480 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5482 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5483 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5485 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5486 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5487 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5489 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5490 5c1e53bc 2019-07-28 stsp ct_path++;
5492 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5493 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5497 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5498 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5500 5c1e53bc 2019-07-28 stsp return NULL;
5503 f0b75401 2019-08-03 stsp static const struct got_error *
5504 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5506 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5508 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5509 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5510 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5513 f0b75401 2019-08-03 stsp return NULL;
5516 5f8a88c6 2019-08-03 stsp static const struct got_error *
5517 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5518 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5520 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5521 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5523 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5524 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5526 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5527 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5528 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5529 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5530 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5531 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5534 5f8a88c6 2019-08-03 stsp return NULL;
5537 39cd0ff6 2019-07-12 stsp const struct got_error *
5538 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5539 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5540 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5541 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5542 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5543 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5545 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5546 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5547 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5548 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5549 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5550 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5551 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5552 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5553 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5555 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5557 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5559 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5561 39cd0ff6 2019-07-12 stsp goto done;
5563 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5565 39cd0ff6 2019-07-12 stsp goto done;
5567 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5569 39cd0ff6 2019-07-12 stsp goto done;
5571 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5573 39cd0ff6 2019-07-12 stsp goto done;
5575 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5576 5f8a88c6 2019-08-03 stsp &have_staged_files);
5577 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5578 5f8a88c6 2019-08-03 stsp goto done;
5579 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5580 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5582 5f8a88c6 2019-08-03 stsp goto done;
5585 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5586 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5587 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5588 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5589 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5590 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5591 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5592 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5593 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5595 5c1e53bc 2019-07-28 stsp goto done;
5598 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5599 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5600 39cd0ff6 2019-07-12 stsp goto done;
5603 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5604 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5606 5c1e53bc 2019-07-28 stsp goto done;
5609 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5610 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5611 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5613 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5614 f0b75401 2019-08-03 stsp ct_path++;
5615 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5616 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5617 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5619 b50cabdf 2019-07-12 stsp goto done;
5623 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5624 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5625 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5627 39cd0ff6 2019-07-12 stsp goto done;
5629 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5630 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
5631 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5632 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5633 39cd0ff6 2019-07-12 stsp err = sync_err;
5635 39cd0ff6 2019-07-12 stsp if (fileindex)
5636 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5637 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5638 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5639 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5640 39cd0ff6 2019-07-12 stsp err = unlockerr;
5641 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5642 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5643 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5645 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5646 c4296144 2019-05-09 stsp return err;
5649 8656d6c4 2019-05-20 stsp const char *
5650 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5652 8656d6c4 2019-05-20 stsp return ct->path;
5655 8656d6c4 2019-05-20 stsp unsigned int
5656 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5658 8656d6c4 2019-05-20 stsp return ct->status;
5661 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5662 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5663 818c7501 2019-07-11 stsp struct got_repository *repo;
5666 818c7501 2019-07-11 stsp static const struct got_error *
5667 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5669 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5670 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5671 818c7501 2019-07-11 stsp unsigned char status;
5672 818c7501 2019-07-11 stsp struct stat sb;
5673 818c7501 2019-07-11 stsp char *ondisk_path;
5675 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5676 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5677 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5678 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5680 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5682 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5684 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5685 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5686 818c7501 2019-07-11 stsp free(ondisk_path);
5688 818c7501 2019-07-11 stsp return err;
5690 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5691 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5692 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5693 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5695 818c7501 2019-07-11 stsp return NULL;
5698 818c7501 2019-07-11 stsp const struct got_error *
5699 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5700 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5701 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5702 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5704 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5705 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5706 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5707 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5708 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5709 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5710 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5712 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5713 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5714 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5716 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5718 818c7501 2019-07-11 stsp return err;
5720 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5722 818c7501 2019-07-11 stsp goto done;
5724 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5725 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5726 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5729 818c7501 2019-07-11 stsp goto done;
5731 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5733 818c7501 2019-07-11 stsp goto done;
5735 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5737 818c7501 2019-07-11 stsp goto done;
5739 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5741 818c7501 2019-07-11 stsp goto done;
5743 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5746 e51d7b55 2020-01-04 stsp goto done;
5748 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5750 818c7501 2019-07-11 stsp goto done;
5751 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5752 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5753 e51d7b55 2020-01-04 stsp goto done;
5756 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5757 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5759 818c7501 2019-07-11 stsp goto done;
5760 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5762 818c7501 2019-07-11 stsp goto done;
5764 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5766 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5768 818c7501 2019-07-11 stsp goto done;
5770 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5772 818c7501 2019-07-11 stsp goto done;
5774 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5775 818c7501 2019-07-11 stsp worktree->base_commit_id);
5777 818c7501 2019-07-11 stsp goto done;
5778 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5780 818c7501 2019-07-11 stsp goto done;
5782 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5784 818c7501 2019-07-11 stsp goto done;
5786 818c7501 2019-07-11 stsp free(fileindex_path);
5787 818c7501 2019-07-11 stsp free(tmp_branch_name);
5788 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5789 818c7501 2019-07-11 stsp free(branch_ref_name);
5790 818c7501 2019-07-11 stsp if (branch_ref)
5791 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5792 818c7501 2019-07-11 stsp if (wt_branch)
5793 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5794 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5795 818c7501 2019-07-11 stsp if (err) {
5796 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5797 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5798 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5800 818c7501 2019-07-11 stsp if (*tmp_branch) {
5801 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5802 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5804 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5805 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5806 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5808 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5810 818c7501 2019-07-11 stsp return err;
5813 818c7501 2019-07-11 stsp const struct got_error *
5814 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5815 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5816 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5817 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5819 818c7501 2019-07-11 stsp const struct got_error *err;
5820 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5821 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5822 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5823 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5824 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5826 818c7501 2019-07-11 stsp *commit_id = NULL;
5827 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5828 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5829 3e3a69f1 2019-07-25 stsp *branch = NULL;
5830 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5832 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5834 3e3a69f1 2019-07-25 stsp return err;
5836 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5838 f032f1f7 2019-08-04 stsp goto done;
5840 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5841 f032f1f7 2019-08-04 stsp &have_staged_files);
5842 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5843 f032f1f7 2019-08-04 stsp goto done;
5844 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5845 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5846 3e3a69f1 2019-07-25 stsp goto done;
5849 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5851 f032f1f7 2019-08-04 stsp goto done;
5853 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5855 818c7501 2019-07-11 stsp goto done;
5857 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5859 818c7501 2019-07-11 stsp goto done;
5861 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5863 818c7501 2019-07-11 stsp goto done;
5865 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5867 818c7501 2019-07-11 stsp goto done;
5869 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5870 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5872 818c7501 2019-07-11 stsp goto done;
5874 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5876 818c7501 2019-07-11 stsp goto done;
5878 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5880 818c7501 2019-07-11 stsp goto done;
5882 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5883 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5885 818c7501 2019-07-11 stsp goto done;
5887 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5889 818c7501 2019-07-11 stsp goto done;
5891 818c7501 2019-07-11 stsp free(commit_ref_name);
5892 818c7501 2019-07-11 stsp free(branch_ref_name);
5893 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5894 818c7501 2019-07-11 stsp if (commit_ref)
5895 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5896 818c7501 2019-07-11 stsp if (branch_ref)
5897 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5898 818c7501 2019-07-11 stsp if (err) {
5899 818c7501 2019-07-11 stsp free(*commit_id);
5900 818c7501 2019-07-11 stsp *commit_id = NULL;
5901 818c7501 2019-07-11 stsp if (*tmp_branch) {
5902 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5903 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5905 818c7501 2019-07-11 stsp if (*new_base_branch) {
5906 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5907 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5909 818c7501 2019-07-11 stsp if (*branch) {
5910 818c7501 2019-07-11 stsp got_ref_close(*branch);
5911 818c7501 2019-07-11 stsp *branch = NULL;
5913 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5914 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5915 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5917 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
5919 818c7501 2019-07-11 stsp return err;
5922 818c7501 2019-07-11 stsp const struct got_error *
5923 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5925 818c7501 2019-07-11 stsp const struct got_error *err;
5926 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
5928 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5930 818c7501 2019-07-11 stsp return err;
5932 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5933 818c7501 2019-07-11 stsp free(tmp_branch_name);
5934 818c7501 2019-07-11 stsp return NULL;
5937 818c7501 2019-07-11 stsp static const struct got_error *
5938 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5939 818c7501 2019-07-11 stsp char **logmsg, void *arg)
5941 0ebf8283 2019-07-24 stsp *logmsg = arg;
5942 818c7501 2019-07-11 stsp return NULL;
5945 818c7501 2019-07-11 stsp static const struct got_error *
5946 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5947 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5948 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5949 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5951 818c7501 2019-07-11 stsp return NULL;
5954 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
5955 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
5956 01757395 2019-07-12 stsp void *progress_arg;
5957 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
5960 01757395 2019-07-12 stsp static const struct got_error *
5961 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
5963 01757395 2019-07-12 stsp const struct got_error *err;
5964 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5966 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5968 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5970 01757395 2019-07-12 stsp return err;
5972 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5973 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5974 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5975 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5976 01757395 2019-07-12 stsp return NULL;
5978 01757395 2019-07-12 stsp p = strdup(path);
5979 01757395 2019-07-12 stsp if (p == NULL)
5980 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5982 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5983 01757395 2019-07-12 stsp if (err || new == NULL)
5985 01757395 2019-07-12 stsp return err;
5989 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5991 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5993 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5994 01757395 2019-07-12 stsp free((char *)pe->path);
5996 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
5999 0ebf8283 2019-07-24 stsp static const struct got_error *
6000 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6001 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6003 818c7501 2019-07-11 stsp const struct got_error *err;
6004 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6006 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6007 818c7501 2019-07-11 stsp if (err) {
6008 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6009 818c7501 2019-07-11 stsp goto done;
6010 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6012 818c7501 2019-07-11 stsp goto done;
6013 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6015 818c7501 2019-07-11 stsp goto done;
6016 de05890f 2020-03-05 stsp } else if (is_rebase) {
6017 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6020 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6022 818c7501 2019-07-11 stsp goto done;
6023 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6024 818c7501 2019-07-11 stsp free(stored_id);
6025 818c7501 2019-07-11 stsp if (cmp != 0) {
6026 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6027 818c7501 2019-07-11 stsp goto done;
6031 0ebf8283 2019-07-24 stsp if (commit_ref)
6032 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6033 0ebf8283 2019-07-24 stsp return err;
6036 0ebf8283 2019-07-24 stsp static const struct got_error *
6037 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6038 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6039 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6040 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6041 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6042 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6044 0ebf8283 2019-07-24 stsp const struct got_error *err;
6045 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6046 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6047 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6049 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6051 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6053 0ebf8283 2019-07-24 stsp return err;
6055 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6056 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6057 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6058 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6059 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6060 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6061 818c7501 2019-07-11 stsp if (commit_ref)
6062 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6063 818c7501 2019-07-11 stsp return err;
6066 818c7501 2019-07-11 stsp const struct got_error *
6067 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6068 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6069 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6070 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6071 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6072 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6074 0ebf8283 2019-07-24 stsp const struct got_error *err;
6075 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6077 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6079 0ebf8283 2019-07-24 stsp return err;
6081 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6083 0ebf8283 2019-07-24 stsp goto done;
6085 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6086 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6087 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6089 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6090 0ebf8283 2019-07-24 stsp return err;
6093 0ebf8283 2019-07-24 stsp const struct got_error *
6094 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6095 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6096 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6097 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6098 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6099 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6101 0ebf8283 2019-07-24 stsp const struct got_error *err;
6102 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6104 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6106 0ebf8283 2019-07-24 stsp return err;
6108 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6110 0ebf8283 2019-07-24 stsp goto done;
6112 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6113 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6114 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6116 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6117 0ebf8283 2019-07-24 stsp return err;
6120 0ebf8283 2019-07-24 stsp static const struct got_error *
6121 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6122 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6123 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6124 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6125 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6127 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6128 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6129 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6130 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6131 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6132 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6133 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6135 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6136 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6138 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6140 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6142 3e3a69f1 2019-07-25 stsp return err;
6144 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6145 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6146 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6147 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6149 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6150 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6151 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6152 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6154 01757395 2019-07-12 stsp if (merged_paths) {
6155 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6156 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6157 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6158 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6161 01757395 2019-07-12 stsp goto done;
6164 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6165 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6167 01757395 2019-07-12 stsp goto done;
6170 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6171 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6172 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6174 a0e95631 2019-07-12 stsp goto done;
6175 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6176 a0e95631 2019-07-12 stsp goto done;
6179 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6181 edd02c5e 2019-07-11 stsp goto done;
6183 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6185 818c7501 2019-07-11 stsp goto done;
6187 5943eee2 2019-08-13 stsp if (new_logmsg) {
6188 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6189 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6190 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6191 5943eee2 2019-08-13 stsp goto done;
6194 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6196 5943eee2 2019-08-13 stsp goto done;
6199 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6200 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6201 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6202 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6203 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6205 a0e95631 2019-07-12 stsp goto done;
6207 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6209 a0e95631 2019-07-12 stsp goto done;
6211 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6213 a0e95631 2019-07-12 stsp goto done;
6215 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
6216 72fd46fa 2019-09-06 stsp fileindex, 0);
6217 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6218 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6219 a0e95631 2019-07-12 stsp err = sync_err;
6221 a0e95631 2019-07-12 stsp free(fileindex_path);
6222 a0e95631 2019-07-12 stsp free(head_commit_id);
6223 a0e95631 2019-07-12 stsp if (head_ref)
6224 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6225 818c7501 2019-07-11 stsp if (err) {
6226 818c7501 2019-07-11 stsp free(*new_commit_id);
6227 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6229 818c7501 2019-07-11 stsp return err;
6232 818c7501 2019-07-11 stsp const struct got_error *
6233 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6234 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6235 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6236 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6237 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6239 0ebf8283 2019-07-24 stsp const struct got_error *err;
6240 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6241 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6242 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6244 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6246 0ebf8283 2019-07-24 stsp return err;
6248 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6250 0ebf8283 2019-07-24 stsp goto done;
6251 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6253 0ebf8283 2019-07-24 stsp goto done;
6254 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6255 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6256 0ebf8283 2019-07-24 stsp goto done;
6259 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6260 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6262 0ebf8283 2019-07-24 stsp if (commit_ref)
6263 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6264 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6265 0ebf8283 2019-07-24 stsp free(commit_id);
6266 0ebf8283 2019-07-24 stsp return err;
6269 0ebf8283 2019-07-24 stsp const struct got_error *
6270 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6271 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6272 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6273 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6274 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6275 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6277 0ebf8283 2019-07-24 stsp const struct got_error *err;
6278 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6279 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6281 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6283 0ebf8283 2019-07-24 stsp return err;
6285 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6287 0ebf8283 2019-07-24 stsp goto done;
6289 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6290 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6292 0ebf8283 2019-07-24 stsp if (commit_ref)
6293 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6294 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6295 0ebf8283 2019-07-24 stsp return err;
6298 0ebf8283 2019-07-24 stsp const struct got_error *
6299 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6300 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6302 3e3a69f1 2019-07-25 stsp if (fileindex)
6303 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6304 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6307 69844fba 2019-07-11 stsp static const struct got_error *
6308 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6310 69844fba 2019-07-11 stsp const struct got_error *err;
6311 69844fba 2019-07-11 stsp struct got_reference *ref;
6313 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6314 69844fba 2019-07-11 stsp if (err) {
6315 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6316 69844fba 2019-07-11 stsp return NULL;
6317 69844fba 2019-07-11 stsp return err;
6320 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6321 69844fba 2019-07-11 stsp got_ref_close(ref);
6322 69844fba 2019-07-11 stsp return err;
6325 69844fba 2019-07-11 stsp static const struct got_error *
6326 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6328 69844fba 2019-07-11 stsp const struct got_error *err;
6329 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6330 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6332 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6334 69844fba 2019-07-11 stsp goto done;
6335 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6337 69844fba 2019-07-11 stsp goto done;
6339 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6341 69844fba 2019-07-11 stsp goto done;
6342 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6344 69844fba 2019-07-11 stsp goto done;
6346 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6348 69844fba 2019-07-11 stsp goto done;
6349 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6351 69844fba 2019-07-11 stsp goto done;
6353 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6355 69844fba 2019-07-11 stsp goto done;
6356 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6358 69844fba 2019-07-11 stsp goto done;
6361 69844fba 2019-07-11 stsp free(tmp_branch_name);
6362 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6363 69844fba 2019-07-11 stsp free(branch_ref_name);
6364 69844fba 2019-07-11 stsp free(commit_ref_name);
6365 69844fba 2019-07-11 stsp return err;
6368 818c7501 2019-07-11 stsp const struct got_error *
6369 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6370 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6371 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6372 818c7501 2019-07-11 stsp struct got_repository *repo)
6374 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
6375 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6377 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6379 818c7501 2019-07-11 stsp return err;
6381 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6383 818c7501 2019-07-11 stsp goto done;
6385 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6387 818c7501 2019-07-11 stsp goto done;
6389 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6391 818c7501 2019-07-11 stsp goto done;
6393 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6395 3e3a69f1 2019-07-25 stsp if (fileindex)
6396 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6397 818c7501 2019-07-11 stsp free(new_head_commit_id);
6398 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6399 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6400 818c7501 2019-07-11 stsp err = unlockerr;
6401 818c7501 2019-07-11 stsp return err;
6404 818c7501 2019-07-11 stsp const struct got_error *
6405 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6406 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6407 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6408 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6410 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6411 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6412 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6413 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6414 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6415 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6417 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6419 818c7501 2019-07-11 stsp return err;
6421 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6422 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6424 818c7501 2019-07-11 stsp goto done;
6426 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6428 818c7501 2019-07-11 stsp goto done;
6431 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6432 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6433 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6435 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6437 818c7501 2019-07-11 stsp goto done;
6439 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6441 818c7501 2019-07-11 stsp goto done;
6443 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6444 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6446 ca355955 2019-07-12 stsp goto done;
6448 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6450 ca355955 2019-07-12 stsp goto done;
6452 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6454 818c7501 2019-07-11 stsp goto done;
6456 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6457 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6458 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6459 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6460 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6461 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6462 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6463 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6464 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6466 1f1abb7e 2019-08-08 stsp goto sync;
6468 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6469 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6471 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6472 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6473 ca355955 2019-07-12 stsp err = sync_err;
6475 818c7501 2019-07-11 stsp got_ref_close(resolved);
6476 a3a2faf2 2019-07-12 stsp free(tree_id);
6477 818c7501 2019-07-11 stsp free(commit_id);
6478 0ebf8283 2019-07-24 stsp if (fileindex)
6479 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6480 0ebf8283 2019-07-24 stsp free(fileindex_path);
6482 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6483 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6484 0ebf8283 2019-07-24 stsp err = unlockerr;
6485 0ebf8283 2019-07-24 stsp return err;
6488 0ebf8283 2019-07-24 stsp const struct got_error *
6489 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6490 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6491 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6492 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6494 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6495 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6496 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6497 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6498 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6499 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6500 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6501 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6503 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6504 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6505 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6506 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6508 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6510 0ebf8283 2019-07-24 stsp return err;
6512 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6514 0ebf8283 2019-07-24 stsp goto done;
6516 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6517 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6518 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6521 0ebf8283 2019-07-24 stsp goto done;
6523 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6525 0ebf8283 2019-07-24 stsp goto done;
6527 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6529 0ebf8283 2019-07-24 stsp goto done;
6531 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6532 0ebf8283 2019-07-24 stsp worktree);
6534 0ebf8283 2019-07-24 stsp goto done;
6536 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6539 0ebf8283 2019-07-24 stsp goto done;
6541 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6543 0ebf8283 2019-07-24 stsp goto done;
6545 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6547 0ebf8283 2019-07-24 stsp goto done;
6549 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6550 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6552 0ebf8283 2019-07-24 stsp goto done;
6553 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6555 0ebf8283 2019-07-24 stsp goto done;
6556 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6557 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6558 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6559 0ebf8283 2019-07-24 stsp goto done;
6562 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6563 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6565 0ebf8283 2019-07-24 stsp goto done;
6566 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6568 0ebf8283 2019-07-24 stsp goto done;
6570 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6572 0ebf8283 2019-07-24 stsp goto done;
6574 0ebf8283 2019-07-24 stsp free(fileindex_path);
6575 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6576 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6577 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6578 0ebf8283 2019-07-24 stsp if (wt_branch)
6579 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6580 0ebf8283 2019-07-24 stsp if (err) {
6581 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6582 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6583 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6585 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6586 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6587 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6589 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6590 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6591 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6592 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6594 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6596 0ebf8283 2019-07-24 stsp return err;
6599 0ebf8283 2019-07-24 stsp const struct got_error *
6600 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6601 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6603 3e3a69f1 2019-07-25 stsp if (fileindex)
6604 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6605 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6608 0ebf8283 2019-07-24 stsp const struct got_error *
6609 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6610 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6612 0ebf8283 2019-07-24 stsp const struct got_error *err;
6613 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6615 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6617 0ebf8283 2019-07-24 stsp return err;
6619 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6620 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6621 0ebf8283 2019-07-24 stsp return NULL;
6624 0ebf8283 2019-07-24 stsp const struct got_error *
6625 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6626 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6627 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6628 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6630 0ebf8283 2019-07-24 stsp const struct got_error *err;
6631 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6632 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6633 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6634 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6635 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6636 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6638 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6639 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6640 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6641 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6643 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6645 3e3a69f1 2019-07-25 stsp return err;
6647 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6649 f032f1f7 2019-08-04 stsp goto done;
6651 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6652 f032f1f7 2019-08-04 stsp &have_staged_files);
6653 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6654 f032f1f7 2019-08-04 stsp goto done;
6655 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6656 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6657 3e3a69f1 2019-07-25 stsp goto done;
6660 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6662 f032f1f7 2019-08-04 stsp goto done;
6664 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6666 0ebf8283 2019-07-24 stsp goto done;
6668 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6670 0ebf8283 2019-07-24 stsp goto done;
6672 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6673 0ebf8283 2019-07-24 stsp worktree);
6675 0ebf8283 2019-07-24 stsp goto done;
6677 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6679 0ebf8283 2019-07-24 stsp goto done;
6681 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6683 0ebf8283 2019-07-24 stsp goto done;
6684 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6686 0ebf8283 2019-07-24 stsp goto done;
6688 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6690 0ebf8283 2019-07-24 stsp goto done;
6691 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6693 0ebf8283 2019-07-24 stsp goto done;
6695 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6697 0ebf8283 2019-07-24 stsp goto done;
6699 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6700 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6701 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6702 0ebf8283 2019-07-24 stsp if (commit_ref)
6703 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6704 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6705 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6706 0ebf8283 2019-07-24 stsp if (err) {
6707 0ebf8283 2019-07-24 stsp free(*commit_id);
6708 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6709 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6710 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6711 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6712 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6713 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6715 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6716 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6717 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6719 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6721 0ebf8283 2019-07-24 stsp return err;
6724 0ebf8283 2019-07-24 stsp static const struct got_error *
6725 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6727 0ebf8283 2019-07-24 stsp const struct got_error *err;
6728 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6729 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6731 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6733 0ebf8283 2019-07-24 stsp goto done;
6734 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6736 0ebf8283 2019-07-24 stsp goto done;
6738 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6739 0ebf8283 2019-07-24 stsp worktree);
6741 0ebf8283 2019-07-24 stsp goto done;
6742 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6744 0ebf8283 2019-07-24 stsp goto done;
6746 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6748 0ebf8283 2019-07-24 stsp goto done;
6749 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6751 0ebf8283 2019-07-24 stsp goto done;
6753 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6755 0ebf8283 2019-07-24 stsp goto done;
6756 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6758 0ebf8283 2019-07-24 stsp goto done;
6760 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6761 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6762 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6763 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6764 0ebf8283 2019-07-24 stsp return err;
6767 0ebf8283 2019-07-24 stsp const struct got_error *
6768 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
6769 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6770 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
6771 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6773 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6774 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6775 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6776 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6777 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6779 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6781 0ebf8283 2019-07-24 stsp return err;
6783 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6784 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6786 0ebf8283 2019-07-24 stsp goto done;
6788 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6790 0ebf8283 2019-07-24 stsp goto done;
6792 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6794 0ebf8283 2019-07-24 stsp goto done;
6796 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6797 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6799 0ebf8283 2019-07-24 stsp goto done;
6801 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6803 0ebf8283 2019-07-24 stsp goto done;
6805 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6807 0ebf8283 2019-07-24 stsp goto done;
6809 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6810 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6811 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6812 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6813 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6814 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6815 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6816 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6817 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6819 1f1abb7e 2019-08-08 stsp goto sync;
6821 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6822 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6824 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6825 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6826 0ebf8283 2019-07-24 stsp err = sync_err;
6828 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6829 0ebf8283 2019-07-24 stsp free(tree_id);
6830 818c7501 2019-07-11 stsp free(fileindex_path);
6832 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6833 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6834 818c7501 2019-07-11 stsp err = unlockerr;
6835 818c7501 2019-07-11 stsp return err;
6838 0ebf8283 2019-07-24 stsp const struct got_error *
6839 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6840 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6841 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6843 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
6844 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6845 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6847 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6849 0ebf8283 2019-07-24 stsp return err;
6851 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6852 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
6854 0ebf8283 2019-07-24 stsp goto done;
6856 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
6858 0ebf8283 2019-07-24 stsp goto done;
6860 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
6862 0ebf8283 2019-07-24 stsp goto done;
6864 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6866 0ebf8283 2019-07-24 stsp goto done;
6868 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6870 3e3a69f1 2019-07-25 stsp if (fileindex)
6871 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6872 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
6873 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6874 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6875 0ebf8283 2019-07-24 stsp err = unlockerr;
6876 0ebf8283 2019-07-24 stsp return err;
6879 0ebf8283 2019-07-24 stsp const struct got_error *
6880 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6881 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6883 0ebf8283 2019-07-24 stsp const struct got_error *err;
6884 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6886 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6888 0ebf8283 2019-07-24 stsp return err;
6890 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6892 0ebf8283 2019-07-24 stsp goto done;
6894 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6896 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6897 2822a352 2019-10-15 stsp return err;
6900 2822a352 2019-10-15 stsp const struct got_error *
6901 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6902 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6903 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
6904 2822a352 2019-10-15 stsp struct got_repository *repo)
6906 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
6907 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6908 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
6910 2822a352 2019-10-15 stsp *fileindex = NULL;
6911 2822a352 2019-10-15 stsp *branch_ref = NULL;
6912 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6914 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
6916 2822a352 2019-10-15 stsp return err;
6918 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6919 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6920 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
6921 2822a352 2019-10-15 stsp "update -b or different branch name required");
6922 2822a352 2019-10-15 stsp goto done;
6925 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6927 2822a352 2019-10-15 stsp goto done;
6929 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
6930 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
6931 2822a352 2019-10-15 stsp ok_arg.repo = repo;
6932 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6935 2822a352 2019-10-15 stsp goto done;
6937 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
6939 2822a352 2019-10-15 stsp goto done;
6941 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
6942 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
6944 2822a352 2019-10-15 stsp if (err) {
6945 2822a352 2019-10-15 stsp if (*branch_ref) {
6946 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
6947 2822a352 2019-10-15 stsp *branch_ref = NULL;
6949 2822a352 2019-10-15 stsp if (*base_branch_ref) {
6950 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
6951 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6953 2822a352 2019-10-15 stsp if (*fileindex) {
6954 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
6955 2822a352 2019-10-15 stsp *fileindex = NULL;
6957 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
6959 0cb83759 2019-08-03 stsp return err;
6962 2822a352 2019-10-15 stsp const struct got_error *
6963 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
6964 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6965 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6966 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6967 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6969 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6970 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6971 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6973 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6975 2822a352 2019-10-15 stsp goto done;
6977 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6979 2822a352 2019-10-15 stsp goto done;
6981 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6982 2822a352 2019-10-15 stsp worktree->path_prefix);
6984 2822a352 2019-10-15 stsp goto done;
6986 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6988 2822a352 2019-10-15 stsp goto done;
6990 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6991 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6993 2822a352 2019-10-15 stsp goto sync;
6995 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6997 2822a352 2019-10-15 stsp goto sync;
6999 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7001 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7002 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7003 2822a352 2019-10-15 stsp err = sync_err;
7006 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7007 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7008 2822a352 2019-10-15 stsp err = unlockerr;
7009 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7011 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7012 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7013 2822a352 2019-10-15 stsp err = unlockerr;
7014 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7016 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7017 2822a352 2019-10-15 stsp free(fileindex_path);
7018 2822a352 2019-10-15 stsp free(tree_id);
7020 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7021 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7022 2822a352 2019-10-15 stsp err = unlockerr;
7023 2822a352 2019-10-15 stsp return err;
7026 2822a352 2019-10-15 stsp const struct got_error *
7027 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7028 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7029 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7031 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7033 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7035 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7037 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7038 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7039 8b692cd0 2019-10-21 stsp err = unlockerr;
7040 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7042 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7043 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7044 8b692cd0 2019-10-21 stsp err = unlockerr;
7045 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7047 8b692cd0 2019-10-21 stsp return err;
7050 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7051 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7052 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7053 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7054 2db2652d 2019-08-07 stsp struct got_repository *repo;
7055 2db2652d 2019-08-07 stsp int have_changes;
7058 2db2652d 2019-08-07 stsp const struct got_error *
7059 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7060 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7061 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7062 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7064 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7065 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7066 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7067 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7068 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7069 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7071 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7072 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7073 8b13ce36 2019-08-08 stsp return NULL;
7074 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7075 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7077 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7078 735ef5ac 2019-08-03 stsp if (ie == NULL)
7079 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7081 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7082 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7083 735ef5ac 2019-08-03 stsp relpath) == -1)
7084 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7086 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7087 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7088 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7089 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7092 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7093 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7094 3aa5969e 2019-08-06 stsp goto done;
7095 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7096 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7097 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7098 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7099 735ef5ac 2019-08-03 stsp goto done;
7102 2db2652d 2019-08-07 stsp a->have_changes = 1;
7104 735ef5ac 2019-08-03 stsp p = in_repo_path;
7105 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7107 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7108 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7109 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7111 735ef5ac 2019-08-03 stsp free(in_repo_path);
7112 dc424a06 2019-08-07 stsp return err;
7115 2db2652d 2019-08-07 stsp struct stage_path_arg {
7116 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7117 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7118 2db2652d 2019-08-07 stsp struct got_repository *repo;
7119 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7120 2db2652d 2019-08-07 stsp void *status_arg;
7121 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7122 2db2652d 2019-08-07 stsp void *patch_arg;
7123 7b5dc508 2019-10-28 stsp int staged_something;
7124 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7127 2db2652d 2019-08-07 stsp static const struct got_error *
7128 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7129 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7130 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7131 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7133 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7134 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7135 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7136 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7137 0cb83759 2019-08-03 stsp uint32_t stage;
7138 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7139 0aeb8099 2020-07-23 stsp struct stat sb;
7141 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7142 8b13ce36 2019-08-08 stsp return NULL;
7144 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7145 d3e7c587 2019-08-03 stsp if (ie == NULL)
7146 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7148 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7149 2db2652d 2019-08-07 stsp relpath)== -1)
7150 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7152 0cb83759 2019-08-03 stsp switch (status) {
7153 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7154 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7155 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7156 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7157 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7160 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7161 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7162 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7163 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7164 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7167 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7170 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7171 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7172 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7173 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7174 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7178 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7179 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7182 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7183 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7184 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7185 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7187 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7188 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7189 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7190 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7191 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7192 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7193 35213c7c 2020-07-23 stsp ssize_t target_len;
7194 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7195 35213c7c 2020-07-23 stsp sizeof(target_path));
7196 35213c7c 2020-07-23 stsp if (target_len == -1) {
7197 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7198 35213c7c 2020-07-23 stsp ondisk_path);
7201 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7202 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7203 35213c7c 2020-07-23 stsp a->worktree->root_path);
7206 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7207 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7208 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7212 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7213 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7214 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7216 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7217 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7219 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7220 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7222 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7223 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7225 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7226 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7227 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7229 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7230 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7232 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7233 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7234 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7235 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7238 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7240 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7241 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7245 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7246 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7247 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7248 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7250 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7251 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7254 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7256 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7257 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7259 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7260 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7263 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7267 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7268 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7269 dc424a06 2019-08-07 stsp free(path_content);
7270 2db2652d 2019-08-07 stsp free(ondisk_path);
7271 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7272 0ebf8283 2019-07-24 stsp return err;
7275 0cb83759 2019-08-03 stsp const struct got_error *
7276 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7277 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7278 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7279 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7280 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
7282 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7283 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7284 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7285 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7286 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7287 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7288 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7289 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7291 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7293 0cb83759 2019-08-03 stsp return err;
7295 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7296 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7298 735ef5ac 2019-08-03 stsp goto done;
7299 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7301 735ef5ac 2019-08-03 stsp goto done;
7302 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7304 0cb83759 2019-08-03 stsp goto done;
7306 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7307 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7308 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7309 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7310 2db2652d 2019-08-07 stsp oka.repo = repo;
7311 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7312 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7313 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7314 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7316 735ef5ac 2019-08-03 stsp goto done;
7318 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7319 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7320 2db2652d 2019-08-07 stsp goto done;
7323 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7324 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7325 2db2652d 2019-08-07 stsp spa.repo = repo;
7326 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7327 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7328 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7329 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7330 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7331 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
7332 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7333 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7334 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7336 2db2652d 2019-08-07 stsp goto done;
7338 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7339 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7340 7b5dc508 2019-10-28 stsp goto done;
7343 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7344 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7345 0cb83759 2019-08-03 stsp err = sync_err;
7347 735ef5ac 2019-08-03 stsp if (head_ref)
7348 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7349 735ef5ac 2019-08-03 stsp free(head_commit_id);
7350 0cb83759 2019-08-03 stsp free(fileindex_path);
7351 0cb83759 2019-08-03 stsp if (fileindex)
7352 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7353 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7354 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7355 0cb83759 2019-08-03 stsp err = unlockerr;
7356 0cb83759 2019-08-03 stsp return err;
7359 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7360 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7361 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7362 ad493afc 2019-08-03 stsp struct got_repository *repo;
7363 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7364 ad493afc 2019-08-03 stsp void *progress_arg;
7365 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7366 2e1f37b0 2019-08-08 stsp void *patch_arg;
7369 2e1f37b0 2019-08-08 stsp static const struct got_error *
7370 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7371 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7372 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7373 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7374 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7376 2e1f37b0 2019-08-08 stsp const struct got_error *err;
7377 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7378 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7379 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7380 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
7381 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
7382 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
7383 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
7384 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
7385 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
7386 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
7388 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7389 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7391 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7393 2e1f37b0 2019-08-08 stsp return err;
7394 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7396 2e1f37b0 2019-08-08 stsp goto done;
7398 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7400 2e1f37b0 2019-08-08 stsp goto done;
7402 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7404 2e1f37b0 2019-08-08 stsp goto done;
7406 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7408 2e1f37b0 2019-08-08 stsp goto done;
7410 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7412 2e1f37b0 2019-08-08 stsp goto done;
7414 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7416 2e1f37b0 2019-08-08 stsp goto done;
7418 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
7419 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
7420 2e1f37b0 2019-08-08 stsp goto done;
7423 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
7424 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
7425 2e1f37b0 2019-08-08 stsp goto done;
7428 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
7429 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
7431 2e1f37b0 2019-08-08 stsp goto done;
7433 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7434 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7436 2e1f37b0 2019-08-08 stsp goto done;
7437 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7438 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7440 2e1f37b0 2019-08-08 stsp goto done;
7442 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7443 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7444 2e1f37b0 2019-08-08 stsp goto done;
7446 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7447 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7448 2e1f37b0 2019-08-08 stsp goto done;
7450 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
7451 2e1f37b0 2019-08-08 stsp int choice;
7452 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
7453 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
7454 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
7455 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
7457 2e1f37b0 2019-08-08 stsp goto done;
7458 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7459 2e1f37b0 2019-08-08 stsp have_content = 1;
7461 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7462 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7465 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7466 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7467 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7469 2e1f37b0 2019-08-08 stsp free(label1);
7471 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7472 2e1f37b0 2019-08-08 stsp if (staged_blob)
7473 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7474 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7475 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7476 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7477 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7478 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7479 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7480 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7481 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7482 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7483 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7484 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7485 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7486 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7487 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7488 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7489 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7490 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7491 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7492 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7494 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
7495 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7496 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7497 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7498 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7499 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7500 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7502 2e1f37b0 2019-08-08 stsp free(args);
7504 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
7507 2e1f37b0 2019-08-08 stsp if (changes)
7508 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
7509 2e1f37b0 2019-08-08 stsp free(path1);
7510 2e1f37b0 2019-08-08 stsp free(path2);
7511 fda8017d 2020-07-23 stsp return err;
7514 fda8017d 2020-07-23 stsp static const struct got_error *
7515 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
7516 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
7517 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7518 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
7519 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
7520 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7521 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7523 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
7524 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
7525 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
7526 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
7527 fda8017d 2020-07-23 stsp FILE *f = NULL;
7528 fda8017d 2020-07-23 stsp struct stat sb;
7530 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
7531 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
7532 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
7534 fda8017d 2020-07-23 stsp return err;
7536 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
7537 fda8017d 2020-07-23 stsp return NULL;
7539 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
7540 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
7541 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
7543 fda8017d 2020-07-23 stsp goto done;
7546 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
7547 fda8017d 2020-07-23 stsp if (f == NULL) {
7548 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
7549 fda8017d 2020-07-23 stsp path_unstaged_content);
7550 fda8017d 2020-07-23 stsp goto done;
7552 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
7553 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
7554 fda8017d 2020-07-23 stsp goto done;
7556 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
7557 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7558 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
7560 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
7561 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
7562 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
7563 fda8017d 2020-07-23 stsp goto done;
7565 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
7566 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
7567 fda8017d 2020-07-23 stsp goto done;
7569 fda8017d 2020-07-23 stsp link_target[r] = '\0';
7570 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
7571 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
7572 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
7573 fda8017d 2020-07-23 stsp progress_arg);
7575 fda8017d 2020-07-23 stsp int local_changes_subsumed;
7576 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
7577 fda8017d 2020-07-23 stsp blob_base, ondisk_path, ie->path,
7578 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
7579 fda8017d 2020-07-23 stsp path_unstaged_content, label_orig, "unstaged",
7580 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
7583 fda8017d 2020-07-23 stsp goto done;
7585 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
7586 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7587 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
7589 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7591 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
7592 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
7593 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7594 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7595 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
7596 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7597 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7598 fda8017d 2020-07-23 stsp if (f && fclose(f) != 0 && err == NULL)
7599 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7600 fda8017d 2020-07-23 stsp free(path_unstaged_content);
7601 fda8017d 2020-07-23 stsp free(path_new_staged_content);
7602 2e1f37b0 2019-08-08 stsp return err;
7605 ad493afc 2019-08-03 stsp static const struct got_error *
7606 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7607 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7608 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7609 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7611 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7612 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7613 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7614 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7615 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
7616 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7617 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7618 9bc94a15 2019-08-03 stsp struct stat sb;
7620 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7621 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7622 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7623 2e1f37b0 2019-08-08 stsp return NULL;
7625 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7626 ad493afc 2019-08-03 stsp if (ie == NULL)
7627 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7629 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7631 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7633 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7634 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7636 f69721c3 2019-10-21 stsp goto done;
7637 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7638 f69721c3 2019-10-21 stsp id_str) == -1) {
7639 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7640 f69721c3 2019-10-21 stsp goto done;
7643 ad493afc 2019-08-03 stsp switch (staged_status) {
7644 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7645 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7646 ad493afc 2019-08-03 stsp blob_id, 8192);
7649 ad493afc 2019-08-03 stsp /* fall through */
7650 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7651 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7652 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7653 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7654 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7655 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7658 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7661 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
7662 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
7663 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
7664 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
7665 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
7666 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7669 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7670 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7673 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
7674 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
7675 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
7676 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7677 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
7678 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
7679 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
7680 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7681 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
7683 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
7684 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7685 36bf999c 2020-07-23 stsp char *staged_target;
7686 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
7687 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
7689 36bf999c 2020-07-23 stsp goto done;
7690 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
7691 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
7692 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
7693 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
7694 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
7695 36bf999c 2020-07-23 stsp free(staged_target);
7697 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
7698 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
7699 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
7700 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
7701 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
7702 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7703 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
7707 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
7710 ad493afc 2019-08-03 stsp if (err == NULL)
7711 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
7712 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
7714 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
7715 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7716 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7717 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7718 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7721 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7723 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7724 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7728 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7729 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
7730 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
7733 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
7737 ad493afc 2019-08-03 stsp free(ondisk_path);
7738 ad493afc 2019-08-03 stsp if (blob_base)
7739 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
7740 ad493afc 2019-08-03 stsp if (blob_staged)
7741 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
7742 f69721c3 2019-10-21 stsp free(id_str);
7743 f69721c3 2019-10-21 stsp free(label_orig);
7744 ad493afc 2019-08-03 stsp return err;
7747 ad493afc 2019-08-03 stsp const struct got_error *
7748 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
7749 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
7750 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7751 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7752 ad493afc 2019-08-03 stsp struct got_repository *repo)
7754 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7755 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7756 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7757 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
7758 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
7760 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7762 ad493afc 2019-08-03 stsp return err;
7764 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7766 ad493afc 2019-08-03 stsp goto done;
7768 ad493afc 2019-08-03 stsp upa.worktree = worktree;
7769 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
7770 ad493afc 2019-08-03 stsp upa.repo = repo;
7771 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
7772 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
7773 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
7774 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
7775 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7776 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7777 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
7779 ad493afc 2019-08-03 stsp goto done;
7782 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7783 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
7784 ad493afc 2019-08-03 stsp err = sync_err;
7786 ad493afc 2019-08-03 stsp free(fileindex_path);
7787 ad493afc 2019-08-03 stsp if (fileindex)
7788 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
7789 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7790 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
7791 ad493afc 2019-08-03 stsp err = unlockerr;
7792 ad493afc 2019-08-03 stsp return err;
7795 b2118c49 2020-07-28 stsp struct report_file_info_arg {
7796 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
7797 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
7798 b2118c49 2020-07-28 stsp void *info_arg;
7799 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
7800 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
7801 b2118c49 2020-07-28 stsp void *cancel_arg;
7804 b2118c49 2020-07-28 stsp static const struct got_error *
7805 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
7807 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
7808 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
7809 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
7810 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
7811 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
7812 b2118c49 2020-07-28 stsp int stage;
7814 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
7815 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
7817 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
7818 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
7819 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
7822 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
7823 b2118c49 2020-07-28 stsp return NULL;
7825 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
7826 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
7827 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
7829 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
7830 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
7831 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
7832 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
7833 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
7834 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
7837 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
7838 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
7839 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
7842 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
7843 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
7846 b2118c49 2020-07-28 stsp const struct got_error *
7847 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
7848 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
7849 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
7850 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7853 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
7854 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
7855 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
7856 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
7858 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
7860 b2118c49 2020-07-28 stsp return err;
7862 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7864 b2118c49 2020-07-28 stsp goto done;
7866 b2118c49 2020-07-28 stsp arg.worktree = worktree;
7867 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
7868 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
7869 b2118c49 2020-07-28 stsp arg.paths = paths;
7870 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
7871 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
7872 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
7875 b2118c49 2020-07-28 stsp free(fileindex_path);
7876 b2118c49 2020-07-28 stsp if (fileindex)
7877 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
7878 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
7879 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
7880 b2118c49 2020-07-28 stsp err = unlockerr;
7881 b2118c49 2020-07-28 stsp return err;
