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 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2052 fddefe3b 2020-10-20 stsp char *parent;
2053 fddefe3b 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
2056 fddefe3b 2020-10-20 stsp free(ondisk_path);
2057 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2058 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2059 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2060 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2061 fddefe3b 2020-10-20 stsp ondisk_path);
2064 fddefe3b 2020-10-20 stsp } while (got_path_cmp(ondisk_path, root_path,
2065 fddefe3b 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
2067 90285c3b 2019-01-08 stsp free(ondisk_path);
2068 90285c3b 2019-01-08 stsp return err;
2071 708d8e67 2019-03-27 stsp static const struct got_error *
2072 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2073 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2074 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2076 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2077 708d8e67 2019-03-27 stsp unsigned char status;
2078 708d8e67 2019-03-27 stsp struct stat sb;
2079 708d8e67 2019-03-27 stsp char *ondisk_path;
2081 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2082 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2084 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2086 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2088 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2090 5a58a424 2020-06-23 stsp goto done;
2092 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2093 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2094 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2095 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2096 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2097 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2098 993e2a1b 2020-07-23 stsp goto done;
2100 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2101 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2102 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2103 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2105 993e2a1b 2020-07-23 stsp goto done;
2106 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2107 993e2a1b 2020-07-23 stsp ie->path);
2108 993e2a1b 2020-07-23 stsp goto done;
2111 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2112 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2113 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2115 5a58a424 2020-06-23 stsp goto done;
2117 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2118 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2120 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
2123 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2125 5a58a424 2020-06-23 stsp goto done;
2126 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2127 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2129 5a58a424 2020-06-23 stsp goto done;
2131 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2134 5a58a424 2020-06-23 stsp free(ondisk_path);
2135 fc6346c4 2019-03-27 stsp return err;
2138 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2139 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2140 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2141 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2142 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2143 8da9e5f4 2019-01-12 stsp void *progress_arg;
2144 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2145 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2148 512f0d0e 2019-01-02 stsp static const struct got_error *
2149 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2150 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2152 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2154 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2155 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2157 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2158 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2161 8da9e5f4 2019-01-12 stsp static const struct got_error *
2162 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2164 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2166 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2167 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2169 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2170 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2173 9d31a1d8 2018-03-11 stsp static const struct got_error *
2174 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2176 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2177 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2178 8da9e5f4 2019-01-12 stsp char *path;
2180 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2181 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2183 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2184 63c5ca5d 2019-08-24 stsp return NULL;
2186 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2187 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2189 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2191 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2192 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2194 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2195 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2197 8da9e5f4 2019-01-12 stsp free(path);
2198 0cd1c46a 2019-03-11 stsp return err;
2201 b2118c49 2020-07-28 stsp const struct got_error *
2202 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2204 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2206 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2207 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2208 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2209 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2212 b2118c49 2020-07-28 stsp return NULL;
2215 818c7501 2019-07-11 stsp static const struct got_error *
2216 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2218 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2219 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2221 517bab73 2019-03-11 stsp *refname = NULL;
2223 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2225 b2118c49 2020-07-28 stsp return err;
2227 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2228 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2229 0647c563 2019-03-11 stsp *refname = NULL;
2231 517bab73 2019-03-11 stsp free(uuidstr);
2232 517bab73 2019-03-11 stsp return err;
2235 818c7501 2019-07-11 stsp const struct got_error *
2236 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2238 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2241 818c7501 2019-07-11 stsp static const struct got_error *
2242 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2244 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2245 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2248 818c7501 2019-07-11 stsp static const struct got_error *
2249 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2251 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2254 818c7501 2019-07-11 stsp static const struct got_error *
2255 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2257 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2258 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2261 818c7501 2019-07-11 stsp static const struct got_error *
2262 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2264 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2265 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2268 0ebf8283 2019-07-24 stsp static const struct got_error *
2269 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2271 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2272 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2275 0ebf8283 2019-07-24 stsp static const struct got_error *
2276 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2278 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2279 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2282 0ebf8283 2019-07-24 stsp static const struct got_error *
2283 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2285 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2286 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2289 0ebf8283 2019-07-24 stsp static const struct got_error *
2290 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2292 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2293 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2296 0ebf8283 2019-07-24 stsp const struct got_error *
2297 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2298 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2300 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2301 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2302 0ebf8283 2019-07-24 stsp *path = NULL;
2303 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2305 0ebf8283 2019-07-24 stsp return NULL;
2309 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2310 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2312 517bab73 2019-03-11 stsp static const struct got_error *
2313 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2315 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2316 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2317 517bab73 2019-03-11 stsp char *refname;
2319 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2321 517bab73 2019-03-11 stsp return err;
2323 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2325 0cd1c46a 2019-03-11 stsp goto done;
2327 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2329 0cd1c46a 2019-03-11 stsp free(refname);
2331 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2332 3e3a69f1 2019-07-25 stsp return err;
2335 3e3a69f1 2019-07-25 stsp static const struct got_error *
2336 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2338 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2340 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2341 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2342 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2343 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2345 9d31a1d8 2018-03-11 stsp return err;
2349 ebf99748 2019-05-09 stsp static const struct got_error *
2350 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2351 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2353 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2354 ebf99748 2019-05-09 stsp FILE *index = NULL;
2356 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2357 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2358 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2359 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2361 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2363 ebf99748 2019-05-09 stsp goto done;
2365 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2366 ebf99748 2019-05-09 stsp if (index == NULL) {
2367 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2368 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2370 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2371 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
2372 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2375 ebf99748 2019-05-09 stsp if (err) {
2376 ebf99748 2019-05-09 stsp free(*fileindex_path);
2377 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2378 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2379 ebf99748 2019-05-09 stsp *fileindex = NULL;
2381 ebf99748 2019-05-09 stsp return err;
2384 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2385 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2386 c932eeeb 2019-05-22 stsp const char *path;
2387 c932eeeb 2019-05-22 stsp size_t path_len;
2388 c932eeeb 2019-05-22 stsp const char *entry_name;
2389 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2390 a484d721 2019-06-10 stsp void *progress_arg;
2393 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2394 c932eeeb 2019-05-22 stsp static const struct got_error *
2395 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2397 1ee397ad 2019-07-12 stsp const struct got_error *err;
2398 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2400 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2401 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2402 c932eeeb 2019-05-22 stsp return NULL;
2403 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2404 102ff934 2019-06-11 stsp return NULL;
2406 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2407 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2408 c932eeeb 2019-05-22 stsp return NULL;
2410 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2411 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2412 edd02c5e 2019-07-11 stsp ie->path);
2414 1ee397ad 2019-07-12 stsp return err;
2416 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2417 c932eeeb 2019-05-22 stsp return NULL;
2420 9c6338c4 2019-06-02 stsp static const struct got_error *
2421 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2423 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2424 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2425 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2426 867630bb 2020-01-17 stsp struct timespec timeout;
2428 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2429 9c6338c4 2019-06-02 stsp fileindex_path);
2431 9c6338c4 2019-06-02 stsp goto done;
2433 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2435 9c6338c4 2019-06-02 stsp goto done;
2437 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2438 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2439 9c6338c4 2019-06-02 stsp fileindex_path);
2440 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2444 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2445 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2446 867630bb 2020-01-17 stsp * was recorded in the file index.
2448 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2449 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2450 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2452 9c6338c4 2019-06-02 stsp if (new_index)
2453 9c6338c4 2019-06-02 stsp fclose(new_index);
2454 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2455 9c6338c4 2019-06-02 stsp return err;
2458 6ced4176 2019-07-12 stsp static const struct got_error *
2459 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2460 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2461 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2463 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2464 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2465 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2466 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2468 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2469 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2470 6ced4176 2019-07-12 stsp *tree_id = NULL;
2472 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2473 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2474 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2475 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2476 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2477 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2478 6ced4176 2019-07-12 stsp goto done;
2480 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2481 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2483 6ced4176 2019-07-12 stsp goto done;
2484 6ced4176 2019-07-12 stsp return NULL;
2487 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2489 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2490 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2491 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2492 6ced4176 2019-07-12 stsp goto done;
2495 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2496 6ced4176 2019-07-12 stsp in_repo_path);
2498 6ced4176 2019-07-12 stsp goto done;
2500 6ced4176 2019-07-12 stsp free(in_repo_path);
2501 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2503 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2505 6ced4176 2019-07-12 stsp goto done;
2507 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2508 6ced4176 2019-07-12 stsp /* Check out a single file. */
2509 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2510 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2511 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2512 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2513 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2514 6ced4176 2019-07-12 stsp goto done;
2516 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2517 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2518 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2519 6ced4176 2019-07-12 stsp goto done;
2522 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2523 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2525 6ced4176 2019-07-12 stsp return err;
2526 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2527 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2528 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2529 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2530 6ced4176 2019-07-12 stsp goto done;
2533 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2534 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2536 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2537 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2538 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2539 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2540 6ced4176 2019-07-12 stsp goto done;
2542 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2543 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2544 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2545 6ced4176 2019-07-12 stsp goto done;
2550 6ced4176 2019-07-12 stsp free(in_repo_path);
2551 6ced4176 2019-07-12 stsp if (err) {
2552 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2553 6ced4176 2019-07-12 stsp free(*tree_relpath);
2554 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2555 6ced4176 2019-07-12 stsp free(*tree_id);
2556 6ced4176 2019-07-12 stsp *tree_id = NULL;
2558 07ed472d 2019-07-12 stsp return err;
2561 07ed472d 2019-07-12 stsp static const struct got_error *
2562 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2563 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2564 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2565 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2567 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2568 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2569 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2570 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2571 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2573 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2574 7f47418f 2019-12-20 stsp if (err) {
2575 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2576 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2577 7f47418f 2019-12-20 stsp goto done;
2578 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2579 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2581 7f47418f 2019-12-20 stsp return err;
2584 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2585 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2587 07ed472d 2019-07-12 stsp goto done;
2589 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2591 07ed472d 2019-07-12 stsp goto done;
2593 07ed472d 2019-07-12 stsp if (entry_name &&
2594 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2595 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2596 07ed472d 2019-07-12 stsp goto done;
2599 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2600 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2601 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2602 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2603 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2604 07ed472d 2019-07-12 stsp arg.repo = repo;
2605 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2606 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2607 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2608 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2609 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2610 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2613 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2614 07ed472d 2019-07-12 stsp if (commit)
2615 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2616 6ced4176 2019-07-12 stsp return err;
2619 9d31a1d8 2018-03-11 stsp const struct got_error *
2620 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2621 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2622 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2623 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2625 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2626 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2627 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2628 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2629 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2630 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2631 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2632 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2633 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2634 f2ea84fa 2019-07-27 stsp int entry_type;
2635 f2ea84fa 2019-07-27 stsp char *relpath;
2636 f2ea84fa 2019-07-27 stsp char *entry_name;
2637 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2638 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2640 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2642 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2644 9d31a1d8 2018-03-11 stsp return err;
2646 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2647 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2648 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2649 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2650 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2651 f2ea84fa 2019-07-27 stsp goto done;
2654 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2655 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2656 f2ea84fa 2019-07-27 stsp if (err) {
2657 f2ea84fa 2019-07-27 stsp free(tpd);
2658 6ced4176 2019-07-12 stsp goto done;
2661 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2662 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2663 f2ea84fa 2019-07-27 stsp if (err) {
2664 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2665 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2666 f2ea84fa 2019-07-27 stsp free(tpd);
2667 f2ea84fa 2019-07-27 stsp goto done;
2670 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2672 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2676 51514078 2018-12-25 stsp * Read the file index.
2677 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2678 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2680 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2682 c4cdcb68 2019-04-03 stsp goto done;
2684 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2685 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2686 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2688 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2689 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2690 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2694 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2695 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2696 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2697 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2698 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2699 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2700 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2701 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2705 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2707 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2708 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2709 af12c6b9 2019-06-04 stsp err = sync_err;
2711 9c6338c4 2019-06-02 stsp free(fileindex_path);
2713 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2714 9d31a1d8 2018-03-11 stsp if (commit)
2715 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2716 5ade8233 2019-07-12 stsp if (fileindex)
2717 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2718 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2719 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2720 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2721 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2722 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2723 f2ea84fa 2019-07-27 stsp free(tpd);
2725 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2726 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2727 9d31a1d8 2018-03-11 stsp err = unlockerr;
2728 f8d1f275 2019-02-04 stsp return err;
2731 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2732 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2733 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2734 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2735 234035bc 2019-06-01 stsp void *progress_arg;
2736 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2737 234035bc 2019-06-01 stsp void *cancel_arg;
2738 f69721c3 2019-10-21 stsp const char *label_orig;
2739 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2742 234035bc 2019-06-01 stsp static const struct got_error *
2743 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2744 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2745 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2746 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2748 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2749 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2750 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2751 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2752 234035bc 2019-06-01 stsp struct stat sb;
2753 234035bc 2019-06-01 stsp unsigned char status;
2754 234035bc 2019-06-01 stsp int local_changes_subsumed;
2756 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2757 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2758 d6c87207 2019-08-02 stsp strlen(path2));
2759 1ee397ad 2019-07-12 stsp if (ie == NULL)
2760 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2761 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2763 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2764 234035bc 2019-06-01 stsp path2) == -1)
2765 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2767 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2770 234035bc 2019-06-01 stsp goto done;
2772 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2773 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2774 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2775 234035bc 2019-06-01 stsp goto done;
2777 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2778 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2779 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2780 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2781 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2782 234035bc 2019-06-01 stsp goto done;
2785 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2786 36bf999c 2020-07-23 stsp char *link_target2;
2787 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2789 36bf999c 2020-07-23 stsp goto done;
2790 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2791 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2792 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2793 36bf999c 2020-07-23 stsp free(link_target2);
2795 af57b12a 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2796 af57b12a 2020-07-23 stsp blob1, ondisk_path, path2, sb.st_mode,
2797 af57b12a 2020-07-23 stsp a->label_orig, blob2, a->commit_id2, repo,
2798 af57b12a 2020-07-23 stsp a->progress_cb, a->progress_arg);
2800 234035bc 2019-06-01 stsp } else if (blob1) {
2801 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2802 d6c87207 2019-08-02 stsp strlen(path1));
2803 1ee397ad 2019-07-12 stsp if (ie == NULL)
2804 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2805 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2807 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2808 2b92fad7 2019-06-02 stsp path1) == -1)
2809 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2811 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2814 2b92fad7 2019-06-02 stsp goto done;
2816 2b92fad7 2019-06-02 stsp switch (status) {
2817 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2818 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2819 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2821 1ee397ad 2019-07-12 stsp goto done;
2822 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2824 2b92fad7 2019-06-02 stsp goto done;
2826 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2828 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2829 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2830 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2831 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2833 1ee397ad 2019-07-12 stsp goto done;
2835 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2837 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2838 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2839 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2841 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2842 0a22ca1a 2020-09-23 stsp * exists in the repository.
2844 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2846 0a22ca1a 2020-09-23 stsp goto done;
2847 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2848 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2849 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2851 0a22ca1a 2020-09-23 stsp goto done;
2852 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2855 0a22ca1a 2020-09-23 stsp goto done;
2857 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2860 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2861 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2863 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2864 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2867 0a22ca1a 2020-09-23 stsp goto done;
2870 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2871 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2872 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2873 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2875 1ee397ad 2019-07-12 stsp goto done;
2877 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2878 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2880 1ee397ad 2019-07-12 stsp goto done;
2885 234035bc 2019-06-01 stsp } else if (blob2) {
2886 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2887 234035bc 2019-06-01 stsp path2) == -1)
2888 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2889 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2890 d6c87207 2019-08-02 stsp strlen(path2));
2892 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2893 7f91a133 2019-12-13 stsp -1, NULL, repo);
2895 234035bc 2019-06-01 stsp goto done;
2896 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2897 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2898 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2899 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2900 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2901 1ee397ad 2019-07-12 stsp status, path2);
2902 234035bc 2019-06-01 stsp goto done;
2904 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2905 36bf999c 2020-07-23 stsp char *link_target2;
2906 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2909 36bf999c 2020-07-23 stsp goto done;
2910 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2911 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2912 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2913 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2914 36bf999c 2020-07-23 stsp free(link_target2);
2915 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2916 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2917 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2918 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2919 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2920 526a746f 2020-07-23 stsp a->progress_arg);
2922 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2923 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2926 dfe9fba0 2020-07-23 stsp goto done;
2927 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2928 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2929 054041d0 2020-06-24 stsp ondisk_path, blob2->id.sha1,
2930 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2932 234035bc 2019-06-01 stsp goto done;
2935 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2936 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2937 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2938 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2939 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2940 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
2942 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2943 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2944 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2947 234035bc 2019-06-01 stsp goto done;
2948 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2950 234035bc 2019-06-01 stsp goto done;
2951 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2952 3969253a 2020-03-07 stsp NULL, NULL, 1);
2953 3969253a 2020-03-07 stsp if (err) {
2954 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2955 3969253a 2020-03-07 stsp goto done;
2957 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2958 2b92fad7 2019-06-02 stsp if (err) {
2959 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2960 2b92fad7 2019-06-02 stsp goto done;
2962 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2963 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2964 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2969 234035bc 2019-06-01 stsp free(ondisk_path);
2970 234035bc 2019-06-01 stsp return err;
2973 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2974 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2975 234035bc 2019-06-01 stsp struct got_repository *repo;
2978 234035bc 2019-06-01 stsp static const struct got_error *
2979 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2981 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2982 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2983 234035bc 2019-06-01 stsp unsigned char status;
2984 234035bc 2019-06-01 stsp struct stat sb;
2985 234035bc 2019-06-01 stsp char *ondisk_path;
2987 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2988 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2989 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2990 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2992 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2994 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2996 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2997 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2999 234035bc 2019-06-01 stsp return err;
3000 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3001 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3003 234035bc 2019-06-01 stsp return NULL;
3006 818c7501 2019-07-11 stsp static const struct got_error *
3007 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3008 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3009 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3010 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3011 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3013 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3014 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3015 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3016 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3017 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3019 03415a1a 2019-06-02 stsp if (commit_id1) {
3020 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3021 03415a1a 2019-06-02 stsp worktree->path_prefix);
3022 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3023 03415a1a 2019-06-02 stsp goto done;
3025 69d57f3d 2020-07-31 stsp if (tree_id1) {
3026 69d57f3d 2020-07-31 stsp char *id_str;
3028 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3030 03415a1a 2019-06-02 stsp goto done;
3032 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3034 f69721c3 2019-10-21 stsp goto done;
3036 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3037 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3038 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3039 f69721c3 2019-10-21 stsp free(id_str);
3040 f69721c3 2019-10-21 stsp goto done;
3042 f69721c3 2019-10-21 stsp free(id_str);
3045 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3046 234035bc 2019-06-01 stsp worktree->path_prefix);
3048 234035bc 2019-06-01 stsp goto done;
3050 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3052 234035bc 2019-06-01 stsp goto done;
3054 234035bc 2019-06-01 stsp arg.worktree = worktree;
3055 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3056 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3057 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3058 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3059 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3060 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3061 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3062 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3063 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3064 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3065 af12c6b9 2019-06-04 stsp err = sync_err;
3067 234035bc 2019-06-01 stsp if (tree1)
3068 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3069 234035bc 2019-06-01 stsp if (tree2)
3070 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3071 f69721c3 2019-10-21 stsp free(label_orig);
3072 818c7501 2019-07-11 stsp return err;
3075 818c7501 2019-07-11 stsp const struct got_error *
3076 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3077 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3078 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3079 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3081 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3082 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3083 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3084 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
3086 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3088 818c7501 2019-07-11 stsp return err;
3090 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3092 818c7501 2019-07-11 stsp goto done;
3094 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
3095 818c7501 2019-07-11 stsp mok_arg.repo = repo;
3096 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3097 818c7501 2019-07-11 stsp &mok_arg);
3099 818c7501 2019-07-11 stsp goto done;
3101 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3102 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3104 818c7501 2019-07-11 stsp if (fileindex)
3105 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3106 818c7501 2019-07-11 stsp free(fileindex_path);
3107 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3108 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3109 234035bc 2019-06-01 stsp err = unlockerr;
3110 234035bc 2019-06-01 stsp return err;
3113 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3114 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3115 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3116 927df6b7 2019-02-10 stsp const char *status_path;
3117 927df6b7 2019-02-10 stsp size_t status_path_len;
3118 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3119 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3120 f8d1f275 2019-02-04 stsp void *status_arg;
3121 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3122 f8d1f275 2019-02-04 stsp void *cancel_arg;
3123 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3124 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
3125 f2a9dc41 2019-12-13 tracey int report_unchanged;
3126 3143d852 2020-06-25 stsp int no_ignores;
3129 f8d1f275 2019-02-04 stsp static const struct got_error *
3130 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3131 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3132 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3133 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3135 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3136 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3137 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3138 927df6b7 2019-02-10 stsp struct stat sb;
3139 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3140 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3141 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3143 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3145 98eaaa12 2019-08-03 stsp return err;
3147 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3148 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3149 98eaaa12 2019-08-03 stsp return NULL;
3151 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3152 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3153 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3155 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3156 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3157 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3159 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3160 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3161 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3162 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3163 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3166 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3167 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3170 927df6b7 2019-02-10 stsp static const struct got_error *
3171 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3172 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3174 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3175 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3176 f8d1f275 2019-02-04 stsp char *abspath;
3178 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3179 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3181 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3182 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3183 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3184 927df6b7 2019-02-10 stsp return NULL;
3186 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3187 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3188 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3189 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3191 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3192 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3193 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3196 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3197 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3198 f8d1f275 2019-02-04 stsp free(abspath);
3199 9d31a1d8 2018-03-11 stsp return err;
3202 f8d1f275 2019-02-04 stsp static const struct got_error *
3203 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3205 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3206 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3207 2ec1f75b 2019-03-26 stsp unsigned char status;
3209 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3210 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3212 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3213 927df6b7 2019-02-10 stsp return NULL;
3215 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3216 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3217 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3218 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3220 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3221 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3222 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3226 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3228 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3230 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3231 6841da00 2019-08-08 stsp free((char *)pe->path);
3232 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3236 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3238 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3240 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3241 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3242 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3243 6841da00 2019-08-08 stsp free((char *)pe->path);
3245 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3248 6841da00 2019-08-08 stsp static const struct got_error *
3249 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3251 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3252 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3253 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3254 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3255 6841da00 2019-08-08 stsp size_t linesize = 0;
3256 6841da00 2019-08-08 stsp ssize_t linelen;
3258 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3259 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3260 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3261 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3263 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3264 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3265 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3267 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3268 bd8de430 2019-10-04 stsp if (line[0] == '#')
3271 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3272 bd8de430 2019-10-04 stsp if (line[0] == '!')
3275 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3276 6841da00 2019-08-08 stsp line) == -1) {
3277 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3278 6841da00 2019-08-08 stsp goto done;
3280 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3282 6841da00 2019-08-08 stsp goto done;
3284 6841da00 2019-08-08 stsp if (ferror(f)) {
3285 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3286 6841da00 2019-08-08 stsp goto done;
3289 6841da00 2019-08-08 stsp dirpath = strdup(path);
3290 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3291 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3292 6841da00 2019-08-08 stsp goto done;
3294 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3296 6841da00 2019-08-08 stsp free(line);
3297 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3298 6841da00 2019-08-08 stsp free(dirpath);
3299 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3301 6841da00 2019-08-08 stsp return err;
3305 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3307 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3309 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3310 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3311 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3312 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3314 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3315 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3317 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3319 bd8de430 2019-10-04 stsp pattern += 3;
3321 bd8de430 2019-10-04 stsp while (*p) {
3322 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3323 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3324 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3325 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3327 bd8de430 2019-10-04 stsp while (*p == '/')
3337 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3338 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3339 6841da00 2019-08-08 stsp * ignores backwards.
3341 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3342 6841da00 2019-08-08 stsp while (pe) {
3343 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3344 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3345 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3346 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3347 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3348 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3349 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3350 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3351 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3356 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3362 6841da00 2019-08-08 stsp static const struct got_error *
3363 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3364 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3366 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3367 6841da00 2019-08-08 stsp char *ignorespath;
3368 886cec17 2019-12-15 stsp int fd = -1;
3369 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3371 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3372 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3373 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3375 886cec17 2019-12-15 stsp if (dirfd != -1) {
3376 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3377 886cec17 2019-12-15 stsp if (fd == -1) {
3378 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3379 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3380 886cec17 2019-12-15 stsp ignorespath);
3382 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3383 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3384 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3385 886cec17 2019-12-15 stsp ignorespath);
3388 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3392 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3393 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3394 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3395 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3396 886cec17 2019-12-15 stsp ignorespath);
3398 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3401 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3402 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3403 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3404 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3405 6841da00 2019-08-08 stsp free(ignorespath);
3406 6841da00 2019-08-08 stsp return err;
3409 f8d1f275 2019-02-04 stsp static const struct got_error *
3410 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3412 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3413 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3414 f8d1f275 2019-02-04 stsp char *path = NULL;
3416 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3417 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3419 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3420 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3421 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3423 f8d1f275 2019-02-04 stsp path = de->d_name;
3426 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3427 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3428 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3429 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3430 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3431 f8d1f275 2019-02-04 stsp if (parent_path[0])
3432 f8d1f275 2019-02-04 stsp free(path);
3433 b72f483a 2019-02-05 stsp return err;
3436 347d1d3e 2019-07-12 stsp static const struct got_error *
3437 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3439 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3440 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3442 3143d852 2020-06-25 stsp if (a->no_ignores)
3443 3143d852 2020-06-25 stsp return NULL;
3445 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3446 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3448 3143d852 2020-06-25 stsp return err;
3450 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3451 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3453 3143d852 2020-06-25 stsp return err;
3456 3143d852 2020-06-25 stsp static const struct got_error *
3457 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3458 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3459 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3461 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3462 abb4604f 2019-07-27 stsp struct stat sb;
3464 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3466 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3467 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3469 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3470 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3471 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3472 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3473 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3474 abb4604f 2019-07-27 stsp return NULL;
3477 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3478 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3479 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3481 abb4604f 2019-07-27 stsp return NULL;
3484 3143d852 2020-06-25 stsp static const struct got_error *
3485 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3486 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3488 3143d852 2020-06-25 stsp const struct got_error *err;
3489 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3491 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3492 3143d852 2020-06-25 stsp ".cvsignore");
3494 3143d852 2020-06-25 stsp return err;
3496 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3497 3143d852 2020-06-25 stsp ".gitignore");
3499 3143d852 2020-06-25 stsp return err;
3501 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3502 3143d852 2020-06-25 stsp if (err) {
3503 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3504 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3505 3143d852 2020-06-25 stsp return err;
3507 3143d852 2020-06-25 stsp for (;;) {
3508 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3509 3143d852 2020-06-25 stsp ".cvsignore");
3512 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3513 3143d852 2020-06-25 stsp ".gitignore");
3516 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3517 3143d852 2020-06-25 stsp if (err) {
3518 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3519 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3522 b737c85a 2020-06-26 stsp free(parent_path);
3523 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3524 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3527 b737c85a 2020-06-26 stsp free(parent_path);
3528 b737c85a 2020-06-26 stsp free(next_parent_path);
3529 3143d852 2020-06-25 stsp return err;
3532 abb4604f 2019-07-27 stsp static const struct got_error *
3533 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3534 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3535 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3536 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3537 f2a9dc41 2019-12-13 tracey int report_unchanged)
3539 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3540 6fc93f37 2019-12-13 stsp int fd = -1;
3541 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3542 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3543 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3545 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3547 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3548 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3549 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3551 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3552 6fc93f37 2019-12-13 stsp if (fd == -1) {
3553 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3554 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3555 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3557 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3558 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3559 f2a9dc41 2019-12-13 tracey report_unchanged);
3561 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3562 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3563 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3564 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3565 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3566 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3567 abb4604f 2019-07-27 stsp arg.status_path = path;
3568 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3569 abb4604f 2019-07-27 stsp arg.repo = repo;
3570 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3571 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3572 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3573 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3574 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3575 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3576 022fae89 2019-12-06 tracey if (!no_ignores) {
3577 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3578 3143d852 2020-06-25 stsp worktree->root_path, path);
3580 3143d852 2020-06-25 stsp goto done;
3582 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3583 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3586 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3587 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
3588 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3589 927df6b7 2019-02-10 stsp free(ondisk_path);
3590 347d1d3e 2019-07-12 stsp return err;
3593 347d1d3e 2019-07-12 stsp const struct got_error *
3594 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3595 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3596 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3597 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3599 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3600 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3601 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3602 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3604 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3606 347d1d3e 2019-07-12 stsp return err;
3608 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3609 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3610 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3614 f8d1f275 2019-02-04 stsp free(fileindex_path);
3615 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3616 f8d1f275 2019-02-04 stsp return err;
3619 6c7ab921 2019-03-18 stsp const struct got_error *
3620 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3621 6c7ab921 2019-03-18 stsp const char *arg)
3623 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3624 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3625 6c7ab921 2019-03-18 stsp size_t len;
3626 00bb5ea0 2020-07-23 stsp struct stat sb;
3628 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3630 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3631 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3632 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3634 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3635 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3636 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3637 00bb5ea0 2020-07-23 stsp goto done;
3640 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3642 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3643 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3644 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3645 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3647 00bb5ea0 2020-07-23 stsp char *abspath = NULL;
3648 00bb5ea0 2020-07-23 stsp char canonpath[PATH_MAX];
3649 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3650 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3651 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3652 00bb5ea0 2020-07-23 stsp goto done;
3656 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3657 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3659 d0710d08 2019-07-22 stsp goto done;
3660 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3661 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3662 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3663 00bb5ea0 2020-07-23 stsp goto done;
3666 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3667 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3668 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3669 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3670 00bb5ea0 2020-07-23 stsp goto done;
3672 00bb5ea0 2020-07-23 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3673 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3674 00bb5ea0 2020-07-23 stsp goto done;
3679 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3680 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3681 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3682 6c7ab921 2019-03-18 stsp goto done;
3685 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3686 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3687 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3689 f6d88e1a 2019-05-29 stsp goto done;
3691 f6d88e1a 2019-05-29 stsp path = strdup("");
3692 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3693 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3694 f6d88e1a 2019-05-29 stsp goto done;
3698 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3699 6c7ab921 2019-03-18 stsp len = strlen(path);
3700 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3701 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3705 6c7ab921 2019-03-18 stsp free(resolved);
3706 d0710d08 2019-07-22 stsp free(cwd);
3707 6c7ab921 2019-03-18 stsp if (err == NULL)
3708 6c7ab921 2019-03-18 stsp *wt_path = path;
3710 6c7ab921 2019-03-18 stsp free(path);
3711 d00136be 2019-03-26 stsp return err;
3714 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3715 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3716 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3717 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3718 4e68cba3 2019-11-23 stsp void *progress_arg;
3719 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3722 4e68cba3 2019-11-23 stsp static const struct got_error *
3723 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3724 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3725 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3726 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3728 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3729 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3730 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3731 6d022e97 2019-08-04 stsp struct stat sb;
3732 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3734 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3735 dbb83fbd 2019-12-12 stsp relpath) == -1)
3736 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3738 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3740 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3741 12463d8b 2019-12-13 stsp de_name, a->repo);
3743 dbb83fbd 2019-12-12 stsp goto done;
3744 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3745 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3746 dbb83fbd 2019-12-12 stsp goto done;
3747 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3749 dbb83fbd 2019-12-12 stsp goto done;
3752 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3753 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3754 dbb83fbd 2019-12-12 stsp goto done;
3757 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3759 4e68cba3 2019-11-23 stsp goto done;
3760 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3761 3969253a 2020-03-07 stsp if (err) {
3762 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3763 3969253a 2020-03-07 stsp goto done;
3765 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3766 07f5b47a 2019-06-02 stsp if (err) {
3767 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3768 4e68cba3 2019-11-23 stsp goto done;
3771 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3773 dbb83fbd 2019-12-12 stsp return err;
3774 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3775 dbb83fbd 2019-12-12 stsp return NULL;
3776 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3779 d00136be 2019-03-26 stsp const struct got_error *
3780 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3781 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3782 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3783 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3785 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3786 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3787 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3788 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3789 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3791 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3793 d00136be 2019-03-26 stsp return err;
3795 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3797 d00136be 2019-03-26 stsp goto done;
3799 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3800 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3801 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3802 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3803 4e68cba3 2019-11-23 stsp saa.repo = repo;
3805 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3806 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3807 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3811 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3812 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3813 af12c6b9 2019-06-04 stsp err = sync_err;
3815 fb399478 2019-07-12 stsp free(fileindex_path);
3816 d00136be 2019-03-26 stsp if (fileindex)
3817 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3818 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3819 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3820 d00136be 2019-03-26 stsp err = unlockerr;
3821 6c7ab921 2019-03-18 stsp return err;
3824 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3825 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3826 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3827 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3828 f2a9dc41 2019-12-13 tracey void *progress_arg;
3829 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3830 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3831 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3832 766841c2 2020-08-13 stsp const char *status_codes;
3835 f2a9dc41 2019-12-13 tracey static const struct got_error *
3836 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3837 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3838 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3839 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3841 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3842 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3843 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3844 17ed4618 2019-06-02 stsp struct stat sb;
3845 20a2ad1c 2020-10-20 stsp char *ondisk_path;
3847 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3848 17ed4618 2019-06-02 stsp if (ie == NULL)
3849 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3851 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3852 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3853 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3854 9acbc4fa 2019-08-03 stsp return NULL;
3855 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3858 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3859 f2a9dc41 2019-12-13 tracey relpath) == -1)
3860 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3862 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3865 f2a9dc41 2019-12-13 tracey goto done;
3867 766841c2 2020-08-13 stsp if (a->status_codes) {
3868 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
3870 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
3871 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
3874 766841c2 2020-08-13 stsp if (i == ncodes) {
3875 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
3876 766841c2 2020-08-13 stsp free(ondisk_path);
3877 766841c2 2020-08-13 stsp return NULL;
3879 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
3880 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
3881 766841c2 2020-08-13 stsp static char msg[64];
3882 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
3883 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
3884 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
3885 766841c2 2020-08-13 stsp goto done;
3889 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3890 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3891 f2a9dc41 2019-12-13 tracey goto done;
3892 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3893 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3894 f2a9dc41 2019-12-13 tracey goto done;
3896 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3897 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3898 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3899 f2a9dc41 2019-12-13 tracey goto done;
3903 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3904 20a2ad1c 2020-10-20 stsp size_t root_len;
3906 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3907 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3908 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3909 12463d8b 2019-12-13 stsp ondisk_path);
3910 12463d8b 2019-12-13 stsp goto done;
3912 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3913 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3914 12463d8b 2019-12-13 stsp goto done;
3917 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
3919 20a2ad1c 2020-10-20 stsp char *parent;
3920 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
3922 2513f20a 2020-10-20 stsp goto done;
3923 20a2ad1c 2020-10-20 stsp free(ondisk_path);
3924 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
3925 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
3926 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3927 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3928 20a2ad1c 2020-10-20 stsp ondisk_path);
3931 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
3932 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
3935 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3937 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3938 f2a9dc41 2019-12-13 tracey if (err)
3939 f2a9dc41 2019-12-13 tracey return err;
3940 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3941 f2a9dc41 2019-12-13 tracey return NULL;
3942 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3943 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3946 2ec1f75b 2019-03-26 stsp const struct got_error *
3947 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3948 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3949 766841c2 2020-08-13 stsp const char *status_codes,
3950 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3951 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3953 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3954 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3955 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3956 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3957 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3959 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3961 2ec1f75b 2019-03-26 stsp return err;
3963 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3965 2ec1f75b 2019-03-26 stsp goto done;
3967 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3968 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3969 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3970 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3971 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3972 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3973 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3974 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
3976 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3977 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3978 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3982 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3983 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3984 af12c6b9 2019-06-04 stsp err = sync_err;
3986 fb399478 2019-07-12 stsp free(fileindex_path);
3987 2ec1f75b 2019-03-26 stsp if (fileindex)
3988 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3989 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3990 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3991 2ec1f75b 2019-03-26 stsp err = unlockerr;
3992 33aa809d 2019-08-08 stsp return err;
3995 33aa809d 2019-08-08 stsp static const struct got_error *
3996 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3998 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3999 33aa809d 2019-08-08 stsp char *line = NULL;
4000 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4001 33aa809d 2019-08-08 stsp ssize_t linelen;
4003 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4004 33aa809d 2019-08-08 stsp if (linelen == -1) {
4005 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4006 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4007 33aa809d 2019-08-08 stsp goto done;
4009 33aa809d 2019-08-08 stsp return NULL;
4011 33aa809d 2019-08-08 stsp if (outfile) {
4012 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4013 33aa809d 2019-08-08 stsp if (n != linelen) {
4014 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4015 33aa809d 2019-08-08 stsp goto done;
4018 33aa809d 2019-08-08 stsp if (rejectfile) {
4019 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4020 33aa809d 2019-08-08 stsp if (n != linelen)
4021 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4024 33aa809d 2019-08-08 stsp free(line);
4025 2ec1f75b 2019-03-26 stsp return err;
4028 33aa809d 2019-08-08 stsp static const struct got_error *
4029 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4031 33aa809d 2019-08-08 stsp char *line = NULL;
4032 33aa809d 2019-08-08 stsp size_t linesize = 0;
4033 33aa809d 2019-08-08 stsp ssize_t linelen;
4035 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4036 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4037 500467ff 2019-09-25 hiltjo if (ferror(f))
4038 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4039 500467ff 2019-09-25 hiltjo return NULL;
4041 33aa809d 2019-08-08 stsp free(line);
4042 33aa809d 2019-08-08 stsp return NULL;
4045 33aa809d 2019-08-08 stsp static const struct got_error *
4046 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4047 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4048 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4050 33aa809d 2019-08-08 stsp const struct got_error *err;
4052 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4053 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4054 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4056 33aa809d 2019-08-08 stsp return err;
4057 33aa809d 2019-08-08 stsp (*line_cur1)++;
4059 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4060 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4061 33aa809d 2019-08-08 stsp if (rejectfile)
4062 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4064 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4066 33aa809d 2019-08-08 stsp return err;
4067 33aa809d 2019-08-08 stsp (*line_cur2)++;
4069 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4070 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4071 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4073 33aa809d 2019-08-08 stsp return err;
4074 33aa809d 2019-08-08 stsp (*line_cur2)++;
4076 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4077 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4078 33aa809d 2019-08-08 stsp if (rejectfile)
4079 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4081 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4083 33aa809d 2019-08-08 stsp return err;
4084 33aa809d 2019-08-08 stsp (*line_cur1)++;
4087 f1e81a05 2019-08-10 stsp return NULL;
4090 f1e81a05 2019-08-10 stsp static const struct got_error *
4091 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4092 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4094 f1e81a05 2019-08-10 stsp const struct got_error *err;
4096 f1e81a05 2019-08-10 stsp if (outfile) {
4097 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4098 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4099 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4101 f1e81a05 2019-08-10 stsp return err;
4102 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4105 f1e81a05 2019-08-10 stsp if (rejectfile) {
4106 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4107 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4108 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4110 f1e81a05 2019-08-10 stsp return err;
4111 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4115 33aa809d 2019-08-08 stsp return NULL;
4118 33aa809d 2019-08-08 stsp static const struct got_error *
4119 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
4120 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
4121 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
4122 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
4123 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4125 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4126 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
4127 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
4128 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
4129 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
4130 33aa809d 2019-08-08 stsp long pos1, pos2;
4131 33aa809d 2019-08-08 stsp FILE *hunkfile;
4133 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4135 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
4136 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
4137 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
4139 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
4140 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
4142 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
4143 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
4145 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
4146 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4147 33aa809d 2019-08-08 stsp goto done;
4149 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
4150 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4151 33aa809d 2019-08-08 stsp goto done;
4153 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4154 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4155 33aa809d 2019-08-08 stsp goto done;
4158 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4159 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
4161 33aa809d 2019-08-08 stsp goto done;
4163 33aa809d 2019-08-08 stsp switch (*choice) {
4164 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4165 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4166 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4168 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4169 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4170 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4172 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4175 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4179 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4180 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4181 33aa809d 2019-08-08 stsp return err;
4184 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4185 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4186 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4187 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4188 1f1abb7e 2019-08-08 stsp void *progress_arg;
4189 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4190 33aa809d 2019-08-08 stsp void *patch_arg;
4191 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4194 e20a8b6f 2019-06-04 stsp static const struct got_error *
4195 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4196 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4197 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4198 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4199 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4201 33aa809d 2019-08-08 stsp const struct got_error *err;
4202 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4203 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4204 1ebedb77 2019-10-19 stsp int fd2 = -1;
4205 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4206 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4207 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4208 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
4209 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
4210 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
4211 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
4212 33aa809d 2019-08-08 stsp struct got_diff_change *change;
4213 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
4214 33aa809d 2019-08-08 stsp int n = 0;
4216 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4218 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4220 33aa809d 2019-08-08 stsp return err;
4222 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4223 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4224 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4225 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4226 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4227 fa3cef63 2020-07-23 stsp goto done;
4229 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4230 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4231 fa3cef63 2020-07-23 stsp if (link_len == -1)
4232 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4233 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4234 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4237 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4238 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4239 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4240 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4241 fa3cef63 2020-07-23 stsp goto done;
4243 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4244 fa3cef63 2020-07-23 stsp sizeof(link_target));
4245 fa3cef63 2020-07-23 stsp if (link_len == -1)
4246 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4247 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4248 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4251 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4252 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4253 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4254 fa3cef63 2020-07-23 stsp goto done;
4257 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4258 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4259 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4260 fa3cef63 2020-07-23 stsp goto done;
4265 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4266 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4267 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4268 fa3cef63 2020-07-23 stsp goto done;
4270 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4271 fa3cef63 2020-07-23 stsp if (n != link_len) {
4272 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4273 fa3cef63 2020-07-23 stsp goto done;
4275 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4276 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4277 fa3cef63 2020-07-23 stsp goto done;
4279 fa3cef63 2020-07-23 stsp rewind(f2);
4282 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4284 33aa809d 2019-08-08 stsp goto done;
4286 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4288 33aa809d 2019-08-08 stsp goto done;
4290 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4292 33aa809d 2019-08-08 stsp goto done;
4294 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
4295 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
4296 33aa809d 2019-08-08 stsp goto done;
4299 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
4300 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
4302 33aa809d 2019-08-08 stsp goto done;
4304 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4306 33aa809d 2019-08-08 stsp goto done;
4308 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4309 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4310 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4311 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4312 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
4313 33aa809d 2019-08-08 stsp int choice;
4314 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
4315 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
4316 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
4317 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4318 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4319 e635744c 2019-08-08 stsp patch_cb, patch_arg);
4321 33aa809d 2019-08-08 stsp goto done;
4322 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4323 33aa809d 2019-08-08 stsp have_content = 1;
4324 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4327 1ebedb77 2019-10-19 stsp if (have_content) {
4328 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4329 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4330 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4332 1ebedb77 2019-10-19 stsp goto done;
4334 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4335 fa3cef63 2020-07-23 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
4336 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("chmod", path2);
4337 fa3cef63 2020-07-23 stsp goto done;
4342 33aa809d 2019-08-08 stsp free(id_str);
4344 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4345 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4346 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4347 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4348 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4349 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4350 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4351 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4352 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4353 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4354 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4355 33aa809d 2019-08-08 stsp if (err || !have_content) {
4356 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4357 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4358 33aa809d 2019-08-08 stsp free(*path_outfile);
4359 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4361 33aa809d 2019-08-08 stsp free(args);
4363 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
4366 33aa809d 2019-08-08 stsp if (changes)
4367 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
4368 33aa809d 2019-08-08 stsp free(path1);
4369 33aa809d 2019-08-08 stsp return err;
4372 33aa809d 2019-08-08 stsp static const struct got_error *
4373 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4374 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4375 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4376 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4378 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4379 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4380 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4381 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4382 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4383 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4384 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4385 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4386 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4387 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4389 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4390 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4391 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4392 d3bcc3d1 2019-08-08 stsp return NULL;
4394 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4395 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4396 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4398 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4399 65084dad 2019-08-08 stsp if (ie == NULL)
4400 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4402 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4403 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4404 a129376b 2019-03-28 stsp if (err) {
4405 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4406 a129376b 2019-03-28 stsp goto done;
4407 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4408 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4409 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4410 e20a8b6f 2019-06-04 stsp goto done;
4413 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4414 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4415 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4416 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4417 a129376b 2019-03-28 stsp goto done;
4420 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4421 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4422 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4423 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4424 a129376b 2019-03-28 stsp goto done;
4427 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4428 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4429 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4430 a129376b 2019-03-28 stsp goto done;
4435 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4436 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4437 a9fa2909 2019-07-27 stsp if (err) {
4438 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4439 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4440 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4441 a9fa2909 2019-07-27 stsp goto done;
4443 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4445 a9fa2909 2019-07-27 stsp goto done;
4447 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4449 a9fa2909 2019-07-27 stsp goto done;
4451 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4452 1233e6b6 2020-10-19 stsp free(te_name);
4453 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4454 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4455 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4456 a9fa2909 2019-07-27 stsp goto done;
4460 a129376b 2019-03-28 stsp switch (status) {
4461 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4462 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4463 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4464 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4465 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4467 33aa809d 2019-08-08 stsp goto done;
4468 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4471 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4472 1f1abb7e 2019-08-08 stsp ie->path);
4474 1ee397ad 2019-07-12 stsp goto done;
4475 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4477 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4478 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4479 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4480 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4481 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4483 33aa809d 2019-08-08 stsp goto done;
4484 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4487 33aa809d 2019-08-08 stsp /* fall through */
4488 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4489 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4490 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4491 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4492 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4493 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4494 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4495 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4496 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4498 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4499 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4500 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4502 65084dad 2019-08-08 stsp goto done;
4504 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4505 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4506 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4507 a129376b 2019-03-28 stsp goto done;
4510 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4511 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4512 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4513 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4514 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4515 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4516 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4518 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4519 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4520 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4521 369fd7e5 2020-07-23 stsp path_content);
4524 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4525 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4526 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4527 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4529 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4530 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4531 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4532 369fd7e5 2020-07-23 stsp goto done;
4536 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4537 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4538 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4539 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4540 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4541 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4543 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4545 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4546 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4547 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4548 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4551 a129376b 2019-03-28 stsp goto done;
4552 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4553 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4554 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4555 054041d0 2020-06-24 stsp ondisk_path, blob->id.sha1,
4556 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4558 2e1fa222 2020-07-23 stsp goto done;
4560 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4561 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4562 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4571 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4572 33aa809d 2019-08-08 stsp free(path_content);
4573 e20a8b6f 2019-06-04 stsp free(parent_path);
4574 a129376b 2019-03-28 stsp free(tree_path);
4576 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4578 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4579 a129376b 2019-03-28 stsp free(tree_id);
4580 e20a8b6f 2019-06-04 stsp return err;
4583 e20a8b6f 2019-06-04 stsp const struct got_error *
4584 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4585 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4586 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4587 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4588 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4590 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4591 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4592 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4593 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4594 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4595 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4597 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4599 e20a8b6f 2019-06-04 stsp return err;
4601 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4603 e20a8b6f 2019-06-04 stsp goto done;
4605 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4606 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4607 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4608 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4609 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4610 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4611 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4612 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4613 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4614 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4618 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4619 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4620 e20a8b6f 2019-06-04 stsp err = sync_err;
4622 fb399478 2019-07-12 stsp free(fileindex_path);
4623 a129376b 2019-03-28 stsp if (fileindex)
4624 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4625 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4626 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4627 a129376b 2019-03-28 stsp err = unlockerr;
4628 c4296144 2019-05-09 stsp return err;
4631 cf066bf8 2019-05-09 stsp static void
4632 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4634 24519714 2019-05-09 stsp free(ct->path);
4635 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4636 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4637 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4638 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4639 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4640 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4644 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4645 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4646 24519714 2019-05-09 stsp struct got_repository *repo;
4647 24519714 2019-05-09 stsp struct got_worktree *worktree;
4648 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4649 5f8a88c6 2019-08-03 stsp int have_staged_files;
4650 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4653 c4296144 2019-05-09 stsp static const struct got_error *
4654 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4655 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4656 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4657 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4659 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4660 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4661 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4662 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4663 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4664 768aea60 2019-05-09 stsp struct stat sb;
4666 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4667 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4668 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4669 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4670 5f8a88c6 2019-08-03 stsp return NULL;
4672 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4673 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4675 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4676 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4677 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4678 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4679 5f8a88c6 2019-08-03 stsp return NULL;
4682 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4683 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4684 036813ee 2019-05-09 stsp goto done;
4686 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4687 036813ee 2019-05-09 stsp parent_path = strdup("");
4688 69960a46 2019-05-09 stsp if (parent_path == NULL)
4689 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4691 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4693 69960a46 2019-05-09 stsp return err;
4696 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4697 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4698 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4699 c4296144 2019-05-09 stsp goto done;
4702 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4703 768aea60 2019-05-09 stsp relpath) == -1) {
4704 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4705 768aea60 2019-05-09 stsp goto done;
4708 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4709 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4710 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4711 0aeb8099 2020-07-23 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4712 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4713 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4714 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4715 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4717 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4718 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4721 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4722 0aeb8099 2020-07-23 stsp goto done;
4724 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4725 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4726 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4727 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4728 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4729 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4730 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4731 12463d8b 2019-12-13 stsp ct->ondisk_path);
4732 12463d8b 2019-12-13 stsp goto done;
4734 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4735 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4736 768aea60 2019-05-09 stsp goto done;
4738 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4741 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4742 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4743 44d03001 2019-05-09 stsp relpath) == -1) {
4744 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4745 44d03001 2019-05-09 stsp goto done;
4748 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4749 35213c7c 2020-07-23 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4750 35213c7c 2020-07-23 stsp int is_bad_symlink;
4751 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4752 35213c7c 2020-07-23 stsp ssize_t target_len;
4753 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4754 35213c7c 2020-07-23 stsp sizeof(target_path));
4755 35213c7c 2020-07-23 stsp if (target_len == -1) {
4756 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4757 35213c7c 2020-07-23 stsp ct->ondisk_path);
4758 35213c7c 2020-07-23 stsp goto done;
4760 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4761 35213c7c 2020-07-23 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4763 35213c7c 2020-07-23 stsp goto done;
4764 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4765 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4766 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4767 35213c7c 2020-07-23 stsp goto done;
4772 cf066bf8 2019-05-09 stsp ct->status = status;
4773 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4774 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4775 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4776 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4777 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4778 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4779 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4780 b416585c 2019-05-13 stsp goto done;
4782 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4783 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4784 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4785 f0b75401 2019-08-03 stsp goto done;
4788 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4789 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4790 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4791 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4792 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4793 036813ee 2019-05-09 stsp goto done;
4796 24519714 2019-05-09 stsp ct->path = strdup(path);
4797 24519714 2019-05-09 stsp if (ct->path == NULL) {
4798 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4799 24519714 2019-05-09 stsp goto done;
4801 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4803 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4804 ed175427 2019-05-09 stsp free_commitable(ct);
4805 24519714 2019-05-09 stsp free(parent_path);
4806 036813ee 2019-05-09 stsp free(path);
4807 a129376b 2019-03-28 stsp return err;
4810 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4811 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4812 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4813 036813ee 2019-05-09 stsp struct got_repository *);
4815 ed175427 2019-05-09 stsp static const struct got_error *
4816 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4817 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4818 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4819 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4820 afa376bf 2019-05-09 stsp struct got_repository *repo)
4822 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4823 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4824 036813ee 2019-05-09 stsp char *subpath;
4826 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4827 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4828 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4830 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4832 ed175427 2019-05-09 stsp return err;
4834 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4835 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4836 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4837 036813ee 2019-05-09 stsp free(subpath);
4838 036813ee 2019-05-09 stsp return err;
4841 036813ee 2019-05-09 stsp static const struct got_error *
4842 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4844 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4845 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4847 036813ee 2019-05-09 stsp *match = 0;
4849 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4850 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4851 0f63689d 2019-05-10 stsp return NULL;
4854 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4856 0f63689d 2019-05-10 stsp return err;
4857 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4858 036813ee 2019-05-09 stsp free(ct_parent_path);
4859 036813ee 2019-05-09 stsp return err;
4862 768aea60 2019-05-09 stsp static mode_t
4863 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4865 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
4866 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
4868 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4871 036813ee 2019-05-09 stsp static const struct got_error *
4872 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4873 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4875 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4877 036813ee 2019-05-09 stsp *new_te = NULL;
4879 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4881 036813ee 2019-05-09 stsp goto done;
4883 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4885 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4886 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4887 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4889 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4891 036813ee 2019-05-09 stsp if (err && *new_te) {
4892 56e0773d 2019-11-28 stsp free(*new_te);
4893 036813ee 2019-05-09 stsp *new_te = NULL;
4895 036813ee 2019-05-09 stsp return err;
4898 036813ee 2019-05-09 stsp static const struct got_error *
4899 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4900 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4902 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4903 102b254e 2020-10-19 stsp char *ct_name = NULL;
4905 036813ee 2019-05-09 stsp *new_te = NULL;
4907 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4908 036813ee 2019-05-09 stsp if (*new_te == NULL)
4909 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4911 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
4913 036813ee 2019-05-09 stsp goto done;
4914 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4915 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4916 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4917 036813ee 2019-05-09 stsp goto done;
4920 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4922 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4923 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4924 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4926 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4928 102b254e 2020-10-19 stsp free(ct_name);
4929 036813ee 2019-05-09 stsp if (err && *new_te) {
4930 56e0773d 2019-11-28 stsp free(*new_te);
4931 036813ee 2019-05-09 stsp *new_te = NULL;
4933 036813ee 2019-05-09 stsp return err;
4936 036813ee 2019-05-09 stsp static const struct got_error *
4937 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
4938 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
4940 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4941 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
4943 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4945 036813ee 2019-05-09 stsp return err;
4946 036813ee 2019-05-09 stsp if (new_pe == NULL)
4947 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
4948 036813ee 2019-05-09 stsp return NULL;
4951 afa376bf 2019-05-09 stsp static const struct got_error *
4952 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
4953 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
4955 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
4956 5f8a88c6 2019-08-03 stsp unsigned char status;
4958 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
4959 afa376bf 2019-05-09 stsp ct_path++;
4961 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4962 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
4964 5f8a88c6 2019-08-03 stsp status = ct->status;
4966 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4967 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4970 036813ee 2019-05-09 stsp static const struct got_error *
4971 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4972 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4974 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4975 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4976 44d03001 2019-05-09 stsp char *te_path;
4978 44d03001 2019-05-09 stsp *modified = 0;
4980 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4981 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4982 44d03001 2019-05-09 stsp te->name) == -1)
4983 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4985 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4986 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4987 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4988 44d03001 2019-05-09 stsp strlen(te_path));
4989 62d463ca 2020-10-20 naddy if (*modified)
4993 44d03001 2019-05-09 stsp free(te_path);
4994 44d03001 2019-05-09 stsp return err;
4997 44d03001 2019-05-09 stsp static const struct got_error *
4998 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4999 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5000 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5002 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5003 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5005 036813ee 2019-05-09 stsp *ctp = NULL;
5007 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5008 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5009 036813ee 2019-05-09 stsp char *ct_name = NULL;
5010 036813ee 2019-05-09 stsp int path_matches;
5012 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5013 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5014 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5015 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5018 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5019 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5023 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5026 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5028 036813ee 2019-05-09 stsp return err;
5029 036813ee 2019-05-09 stsp if (!path_matches)
5032 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5034 d34b633e 2020-10-19 stsp return err;
5036 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5037 d34b633e 2020-10-19 stsp free(ct_name);
5040 d34b633e 2020-10-19 stsp free(ct_name);
5042 036813ee 2019-05-09 stsp *ctp = ct;
5046 2b496619 2019-07-10 stsp return err;
5049 2b496619 2019-07-10 stsp static const struct got_error *
5050 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5051 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5052 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5053 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5054 2b496619 2019-07-10 stsp struct got_repository *repo)
5056 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5057 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5058 2b496619 2019-07-10 stsp char *subtree_path;
5059 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5060 ba580f68 2020-03-22 stsp int nentries;
5062 2b496619 2019-07-10 stsp *new_tep = NULL;
5064 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5065 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5066 2b496619 2019-07-10 stsp child_path) == -1)
5067 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5069 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5070 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5071 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5072 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5074 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5075 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5076 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5077 2b496619 2019-07-10 stsp goto done;
5079 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5080 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5081 2b496619 2019-07-10 stsp if (err) {
5082 56e0773d 2019-11-28 stsp free(new_te);
5083 2b496619 2019-07-10 stsp goto done;
5085 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5088 2b496619 2019-07-10 stsp free(subtree_path);
5089 2b496619 2019-07-10 stsp if (err == NULL)
5090 2b496619 2019-07-10 stsp *new_tep = new_te;
5091 036813ee 2019-05-09 stsp return err;
5094 036813ee 2019-05-09 stsp static const struct got_error *
5095 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5096 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5097 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5098 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5099 036813ee 2019-05-09 stsp struct got_repository *repo)
5101 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5102 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5103 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5104 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5106 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5107 ba580f68 2020-03-22 stsp *nentries = 0;
5109 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5110 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5111 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5112 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5114 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5115 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5116 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5119 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5120 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5123 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5124 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5126 036813ee 2019-05-09 stsp goto done;
5128 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5129 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5130 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5132 036813ee 2019-05-09 stsp goto done;
5133 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5135 afa376bf 2019-05-09 stsp goto done;
5136 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5137 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5139 2f51b5b3 2019-05-09 stsp goto done;
5140 ba580f68 2020-03-22 stsp (*nentries)++;
5142 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5143 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5144 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5145 2b496619 2019-07-10 stsp == NULL) {
5146 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5147 2b496619 2019-07-10 stsp child_path, path_base_tree,
5148 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5151 2b496619 2019-07-10 stsp goto done;
5152 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5154 2b496619 2019-07-10 stsp goto done;
5155 ba580f68 2020-03-22 stsp (*nentries)++;
5160 2f51b5b3 2019-05-09 stsp if (base_tree) {
5161 56e0773d 2019-11-28 stsp int i, nbase_entries;
5162 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5163 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5164 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5165 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5167 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5168 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5169 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5170 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5172 63c5ca5d 2019-08-24 stsp goto done;
5173 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5175 63c5ca5d 2019-08-24 stsp goto done;
5176 ba580f68 2020-03-22 stsp (*nentries)++;
5180 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5181 44d03001 2019-05-09 stsp int modified;
5182 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5184 036813ee 2019-05-09 stsp goto done;
5185 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5186 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5188 2f51b5b3 2019-05-09 stsp goto done;
5189 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5190 44d03001 2019-05-09 stsp if (modified) {
5191 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5192 ba580f68 2020-03-22 stsp int nsubentries;
5193 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5194 ba580f68 2020-03-22 stsp &nsubentries, te,
5195 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5196 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5198 44d03001 2019-05-09 stsp goto done;
5199 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5200 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5201 ba580f68 2020-03-22 stsp free(new_id);
5204 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5205 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5206 56e0773d 2019-11-28 stsp free(new_id);
5208 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5210 036813ee 2019-05-09 stsp goto done;
5211 ba580f68 2020-03-22 stsp (*nentries)++;
5215 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5216 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5218 f66c734c 2019-09-22 stsp goto done;
5220 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5221 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5222 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5223 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5224 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5225 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5227 2f51b5b3 2019-05-09 stsp goto done;
5228 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5230 2f51b5b3 2019-05-09 stsp goto done;
5231 ba580f68 2020-03-22 stsp (*nentries)++;
5233 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5234 b416585c 2019-05-13 stsp status_arg);
5236 afa376bf 2019-05-09 stsp goto done;
5238 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5239 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5241 2f51b5b3 2019-05-09 stsp goto done;
5242 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5244 2f51b5b3 2019-05-09 stsp goto done;
5245 ba580f68 2020-03-22 stsp (*nentries)++;
5250 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5251 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5253 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5254 2e1fa222 2020-07-23 stsp return err;
5257 2e1fa222 2020-07-23 stsp static const struct got_error *
5258 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
5259 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
5260 72fd46fa 2019-09-06 stsp int have_staged_files)
5262 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5263 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5265 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5266 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5267 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5269 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5271 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5272 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5273 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5274 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5275 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5276 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5277 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5278 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5279 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
5280 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5281 72fd46fa 2019-09-06 stsp !have_staged_files);
5283 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5284 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
5285 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5286 72fd46fa 2019-09-06 stsp !have_staged_files);
5288 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5291 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
5292 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
5293 3969253a 2020-03-07 stsp if (err) {
5294 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5297 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5298 3969253a 2020-03-07 stsp if (err) {
5299 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5304 d56d26ce 2019-05-10 stsp return err;
5308 d56d26ce 2019-05-10 stsp static const struct got_error *
5309 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5310 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5311 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5312 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5313 735ef5ac 2019-08-03 stsp int ood_errcode)
5315 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5316 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5318 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5319 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5320 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5321 1a36436d 2019-06-10 stsp return NULL;
5323 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5324 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5326 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5327 735ef5ac 2019-08-03 stsp in_repo_path);
5328 9bead371 2019-07-28 stsp if (err) {
5329 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5330 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5331 1a36436d 2019-06-10 stsp goto done;
5332 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5333 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5335 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5336 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5337 735ef5ac 2019-08-03 stsp in_repo_path);
5338 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5339 1a36436d 2019-06-10 stsp goto done;
5340 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5344 1a36436d 2019-06-10 stsp return err;
5347 c4296144 2019-05-09 stsp const struct got_error *
5348 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5349 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5350 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5351 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5352 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5353 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5354 afa376bf 2019-05-09 stsp struct got_repository *repo)
5356 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5357 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5358 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5359 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5360 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5361 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5362 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5363 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5364 ba580f68 2020-03-22 stsp int nentries;
5365 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5366 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5367 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5369 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5371 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
5373 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5375 588edf97 2019-05-10 stsp goto done;
5377 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5379 588edf97 2019-05-10 stsp goto done;
5381 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5382 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5387 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5388 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5392 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5393 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5394 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5395 cf066bf8 2019-05-09 stsp char *ondisk_path;
5397 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5398 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5399 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5402 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5403 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5404 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5407 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5408 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5409 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5410 cf066bf8 2019-05-09 stsp goto done;
5412 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5413 2e1fa222 2020-07-23 stsp free(ondisk_path);
5415 cf066bf8 2019-05-09 stsp goto done;
5418 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5419 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5420 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5422 036813ee 2019-05-09 stsp goto done;
5424 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5426 de18fc63 2019-05-09 stsp goto done;
5427 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5428 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5429 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5430 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5431 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5432 33ad4cbe 2019-05-12 jcs free(logmsg);
5434 9d40349a 2019-05-09 stsp goto done;
5436 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5437 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5438 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5439 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5440 09f5bd90 2019-05-09 stsp goto done;
5442 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5443 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5445 09f5bd90 2019-05-09 stsp goto done;
5446 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5448 ebf99748 2019-05-09 stsp goto done;
5449 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5450 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5451 09f5bd90 2019-05-09 stsp goto done;
5453 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5454 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5456 f2c16586 2019-05-09 stsp goto done;
5457 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5459 f2c16586 2019-05-09 stsp goto done;
5461 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5463 09f5bd90 2019-05-09 stsp goto done;
5465 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5467 ebf99748 2019-05-09 stsp goto done;
5469 588edf97 2019-05-10 stsp if (head_tree)
5470 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5471 588edf97 2019-05-10 stsp if (head_commit)
5472 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5473 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5474 2f17228e 2019-05-12 stsp if (head_ref2) {
5475 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5476 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5477 2f17228e 2019-05-12 stsp err = unlockerr;
5478 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5480 39cd0ff6 2019-07-12 stsp return err;
5483 5c1e53bc 2019-07-28 stsp static const struct got_error *
5484 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5485 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5487 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5488 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5490 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5491 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5492 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5494 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5495 5c1e53bc 2019-07-28 stsp ct_path++;
5497 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5498 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5502 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5503 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5505 5c1e53bc 2019-07-28 stsp return NULL;
5508 f0b75401 2019-08-03 stsp static const struct got_error *
5509 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5511 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5513 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5514 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5515 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5518 f0b75401 2019-08-03 stsp return NULL;
5521 5f8a88c6 2019-08-03 stsp static const struct got_error *
5522 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5523 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5525 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5526 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5528 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5529 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5531 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5532 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5533 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5534 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5535 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5536 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5539 5f8a88c6 2019-08-03 stsp return NULL;
5542 39cd0ff6 2019-07-12 stsp const struct got_error *
5543 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5544 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5545 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5546 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5547 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5548 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5550 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5551 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5552 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5553 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5554 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5555 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5556 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5557 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5558 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5560 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5562 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5564 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5566 39cd0ff6 2019-07-12 stsp goto done;
5568 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5570 39cd0ff6 2019-07-12 stsp goto done;
5572 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5574 39cd0ff6 2019-07-12 stsp goto done;
5576 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5578 39cd0ff6 2019-07-12 stsp goto done;
5580 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5581 5f8a88c6 2019-08-03 stsp &have_staged_files);
5582 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5583 5f8a88c6 2019-08-03 stsp goto done;
5584 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5585 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5587 5f8a88c6 2019-08-03 stsp goto done;
5590 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5591 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5592 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5593 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5594 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5595 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5596 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5597 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5598 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5600 5c1e53bc 2019-07-28 stsp goto done;
5603 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5604 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5605 39cd0ff6 2019-07-12 stsp goto done;
5608 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5609 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5611 5c1e53bc 2019-07-28 stsp goto done;
5614 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5615 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5616 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5618 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5619 f0b75401 2019-08-03 stsp ct_path++;
5620 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5621 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5622 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5624 b50cabdf 2019-07-12 stsp goto done;
5628 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5629 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5630 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5632 39cd0ff6 2019-07-12 stsp goto done;
5634 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5635 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
5636 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5637 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5638 39cd0ff6 2019-07-12 stsp err = sync_err;
5640 39cd0ff6 2019-07-12 stsp if (fileindex)
5641 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5642 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5643 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5644 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5645 39cd0ff6 2019-07-12 stsp err = unlockerr;
5646 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5647 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5648 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5650 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5651 c4296144 2019-05-09 stsp return err;
5654 8656d6c4 2019-05-20 stsp const char *
5655 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5657 8656d6c4 2019-05-20 stsp return ct->path;
5660 8656d6c4 2019-05-20 stsp unsigned int
5661 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5663 8656d6c4 2019-05-20 stsp return ct->status;
5666 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5667 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5668 818c7501 2019-07-11 stsp struct got_repository *repo;
5671 818c7501 2019-07-11 stsp static const struct got_error *
5672 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5674 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5675 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5676 818c7501 2019-07-11 stsp unsigned char status;
5677 818c7501 2019-07-11 stsp struct stat sb;
5678 818c7501 2019-07-11 stsp char *ondisk_path;
5680 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5681 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5682 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5683 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5685 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5687 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5689 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5690 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5691 818c7501 2019-07-11 stsp free(ondisk_path);
5693 818c7501 2019-07-11 stsp return err;
5695 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5696 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5697 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5698 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5700 818c7501 2019-07-11 stsp return NULL;
5703 818c7501 2019-07-11 stsp const struct got_error *
5704 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5705 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5706 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5707 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5709 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5710 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5711 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5712 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5713 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5714 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5715 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5717 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5718 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5719 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5721 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5723 818c7501 2019-07-11 stsp return err;
5725 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5727 818c7501 2019-07-11 stsp goto done;
5729 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5730 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5731 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5734 818c7501 2019-07-11 stsp goto done;
5736 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5738 818c7501 2019-07-11 stsp goto done;
5740 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5742 818c7501 2019-07-11 stsp goto done;
5744 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5746 818c7501 2019-07-11 stsp goto done;
5748 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5751 e51d7b55 2020-01-04 stsp goto done;
5753 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5755 818c7501 2019-07-11 stsp goto done;
5756 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5757 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5758 e51d7b55 2020-01-04 stsp goto done;
5761 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5762 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5764 818c7501 2019-07-11 stsp goto done;
5765 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5767 818c7501 2019-07-11 stsp goto done;
5769 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5771 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5773 818c7501 2019-07-11 stsp goto done;
5775 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5777 818c7501 2019-07-11 stsp goto done;
5779 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5780 818c7501 2019-07-11 stsp worktree->base_commit_id);
5782 818c7501 2019-07-11 stsp goto done;
5783 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5785 818c7501 2019-07-11 stsp goto done;
5787 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5789 818c7501 2019-07-11 stsp goto done;
5791 818c7501 2019-07-11 stsp free(fileindex_path);
5792 818c7501 2019-07-11 stsp free(tmp_branch_name);
5793 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5794 818c7501 2019-07-11 stsp free(branch_ref_name);
5795 818c7501 2019-07-11 stsp if (branch_ref)
5796 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5797 818c7501 2019-07-11 stsp if (wt_branch)
5798 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5799 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5800 818c7501 2019-07-11 stsp if (err) {
5801 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5802 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5803 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5805 818c7501 2019-07-11 stsp if (*tmp_branch) {
5806 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5807 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5809 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5810 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5811 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5813 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5815 818c7501 2019-07-11 stsp return err;
5818 818c7501 2019-07-11 stsp const struct got_error *
5819 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5820 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5821 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5822 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5824 818c7501 2019-07-11 stsp const struct got_error *err;
5825 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5826 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5827 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5828 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5829 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5831 818c7501 2019-07-11 stsp *commit_id = NULL;
5832 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5833 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5834 3e3a69f1 2019-07-25 stsp *branch = NULL;
5835 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5837 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5839 3e3a69f1 2019-07-25 stsp return err;
5841 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5843 f032f1f7 2019-08-04 stsp goto done;
5845 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5846 f032f1f7 2019-08-04 stsp &have_staged_files);
5847 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5848 f032f1f7 2019-08-04 stsp goto done;
5849 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5850 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5851 3e3a69f1 2019-07-25 stsp goto done;
5854 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5856 f032f1f7 2019-08-04 stsp goto done;
5858 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5860 818c7501 2019-07-11 stsp goto done;
5862 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5864 818c7501 2019-07-11 stsp goto done;
5866 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5868 818c7501 2019-07-11 stsp goto done;
5870 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5872 818c7501 2019-07-11 stsp goto done;
5874 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5875 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5877 818c7501 2019-07-11 stsp goto done;
5879 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5881 818c7501 2019-07-11 stsp goto done;
5883 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5885 818c7501 2019-07-11 stsp goto done;
5887 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5888 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5890 818c7501 2019-07-11 stsp goto done;
5892 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5894 818c7501 2019-07-11 stsp goto done;
5896 818c7501 2019-07-11 stsp free(commit_ref_name);
5897 818c7501 2019-07-11 stsp free(branch_ref_name);
5898 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5899 818c7501 2019-07-11 stsp if (commit_ref)
5900 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5901 818c7501 2019-07-11 stsp if (branch_ref)
5902 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5903 818c7501 2019-07-11 stsp if (err) {
5904 818c7501 2019-07-11 stsp free(*commit_id);
5905 818c7501 2019-07-11 stsp *commit_id = NULL;
5906 818c7501 2019-07-11 stsp if (*tmp_branch) {
5907 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5908 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5910 818c7501 2019-07-11 stsp if (*new_base_branch) {
5911 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5912 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5914 818c7501 2019-07-11 stsp if (*branch) {
5915 818c7501 2019-07-11 stsp got_ref_close(*branch);
5916 818c7501 2019-07-11 stsp *branch = NULL;
5918 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5919 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5920 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5922 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
5924 818c7501 2019-07-11 stsp return err;
5927 818c7501 2019-07-11 stsp const struct got_error *
5928 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5930 818c7501 2019-07-11 stsp const struct got_error *err;
5931 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
5933 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5935 818c7501 2019-07-11 stsp return err;
5937 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5938 818c7501 2019-07-11 stsp free(tmp_branch_name);
5939 818c7501 2019-07-11 stsp return NULL;
5942 818c7501 2019-07-11 stsp static const struct got_error *
5943 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5944 818c7501 2019-07-11 stsp char **logmsg, void *arg)
5946 0ebf8283 2019-07-24 stsp *logmsg = arg;
5947 818c7501 2019-07-11 stsp return NULL;
5950 818c7501 2019-07-11 stsp static const struct got_error *
5951 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5952 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5953 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5954 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5956 818c7501 2019-07-11 stsp return NULL;
5959 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
5960 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
5961 01757395 2019-07-12 stsp void *progress_arg;
5962 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
5965 01757395 2019-07-12 stsp static const struct got_error *
5966 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
5968 01757395 2019-07-12 stsp const struct got_error *err;
5969 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5971 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5973 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5975 01757395 2019-07-12 stsp return err;
5977 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5978 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5979 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5980 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5981 01757395 2019-07-12 stsp return NULL;
5983 01757395 2019-07-12 stsp p = strdup(path);
5984 01757395 2019-07-12 stsp if (p == NULL)
5985 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5987 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5988 01757395 2019-07-12 stsp if (err || new == NULL)
5990 01757395 2019-07-12 stsp return err;
5994 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5996 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5998 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5999 01757395 2019-07-12 stsp free((char *)pe->path);
6001 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6004 0ebf8283 2019-07-24 stsp static const struct got_error *
6005 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6006 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6008 818c7501 2019-07-11 stsp const struct got_error *err;
6009 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6011 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6012 818c7501 2019-07-11 stsp if (err) {
6013 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6014 818c7501 2019-07-11 stsp goto done;
6015 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6017 818c7501 2019-07-11 stsp goto done;
6018 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6020 818c7501 2019-07-11 stsp goto done;
6021 de05890f 2020-03-05 stsp } else if (is_rebase) {
6022 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6025 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6027 818c7501 2019-07-11 stsp goto done;
6028 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6029 818c7501 2019-07-11 stsp free(stored_id);
6030 818c7501 2019-07-11 stsp if (cmp != 0) {
6031 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6032 818c7501 2019-07-11 stsp goto done;
6036 0ebf8283 2019-07-24 stsp if (commit_ref)
6037 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6038 0ebf8283 2019-07-24 stsp return err;
6041 0ebf8283 2019-07-24 stsp static const struct got_error *
6042 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6043 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6044 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6045 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6046 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6047 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6049 0ebf8283 2019-07-24 stsp const struct got_error *err;
6050 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6051 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6052 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6054 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6056 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6058 0ebf8283 2019-07-24 stsp return err;
6060 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6061 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6062 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6063 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6064 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6065 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6066 818c7501 2019-07-11 stsp if (commit_ref)
6067 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6068 818c7501 2019-07-11 stsp return err;
6071 818c7501 2019-07-11 stsp const struct got_error *
6072 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6073 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6074 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6075 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6076 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6077 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6079 0ebf8283 2019-07-24 stsp const struct got_error *err;
6080 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6082 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6084 0ebf8283 2019-07-24 stsp return err;
6086 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6088 0ebf8283 2019-07-24 stsp goto done;
6090 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6091 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6092 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6094 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6095 0ebf8283 2019-07-24 stsp return err;
6098 0ebf8283 2019-07-24 stsp const struct got_error *
6099 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6100 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6101 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6102 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6103 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6104 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6106 0ebf8283 2019-07-24 stsp const struct got_error *err;
6107 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6109 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6111 0ebf8283 2019-07-24 stsp return err;
6113 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6115 0ebf8283 2019-07-24 stsp goto done;
6117 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6118 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6119 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6121 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6122 0ebf8283 2019-07-24 stsp return err;
6125 0ebf8283 2019-07-24 stsp static const struct got_error *
6126 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6127 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6128 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6129 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6130 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6132 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6133 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6134 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6135 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6136 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6137 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6138 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6140 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6141 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6143 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6145 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6147 3e3a69f1 2019-07-25 stsp return err;
6149 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6150 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6151 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6152 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6154 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6155 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6156 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6157 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6159 01757395 2019-07-12 stsp if (merged_paths) {
6160 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6161 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6162 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6163 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6166 01757395 2019-07-12 stsp goto done;
6169 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6170 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6172 01757395 2019-07-12 stsp goto done;
6175 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6176 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6177 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6179 a0e95631 2019-07-12 stsp goto done;
6180 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6181 a0e95631 2019-07-12 stsp goto done;
6184 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6186 edd02c5e 2019-07-11 stsp goto done;
6188 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6190 818c7501 2019-07-11 stsp goto done;
6192 5943eee2 2019-08-13 stsp if (new_logmsg) {
6193 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6194 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6195 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6196 5943eee2 2019-08-13 stsp goto done;
6199 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6201 5943eee2 2019-08-13 stsp goto done;
6204 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6205 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6206 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6207 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6208 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6210 a0e95631 2019-07-12 stsp goto done;
6212 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6214 a0e95631 2019-07-12 stsp goto done;
6216 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6218 a0e95631 2019-07-12 stsp goto done;
6220 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
6221 72fd46fa 2019-09-06 stsp fileindex, 0);
6222 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6223 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6224 a0e95631 2019-07-12 stsp err = sync_err;
6226 a0e95631 2019-07-12 stsp free(fileindex_path);
6227 a0e95631 2019-07-12 stsp free(head_commit_id);
6228 a0e95631 2019-07-12 stsp if (head_ref)
6229 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6230 818c7501 2019-07-11 stsp if (err) {
6231 818c7501 2019-07-11 stsp free(*new_commit_id);
6232 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6234 818c7501 2019-07-11 stsp return err;
6237 818c7501 2019-07-11 stsp const struct got_error *
6238 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6239 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6240 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6241 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6242 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6244 0ebf8283 2019-07-24 stsp const struct got_error *err;
6245 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6246 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6247 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6249 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6251 0ebf8283 2019-07-24 stsp return err;
6253 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6255 0ebf8283 2019-07-24 stsp goto done;
6256 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6258 0ebf8283 2019-07-24 stsp goto done;
6259 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6260 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6261 0ebf8283 2019-07-24 stsp goto done;
6264 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6265 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6267 0ebf8283 2019-07-24 stsp if (commit_ref)
6268 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6269 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6270 0ebf8283 2019-07-24 stsp free(commit_id);
6271 0ebf8283 2019-07-24 stsp return err;
6274 0ebf8283 2019-07-24 stsp const struct got_error *
6275 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6276 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6277 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6278 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6279 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6280 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6282 0ebf8283 2019-07-24 stsp const struct got_error *err;
6283 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6284 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6286 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6288 0ebf8283 2019-07-24 stsp return err;
6290 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6292 0ebf8283 2019-07-24 stsp goto done;
6294 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6295 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6297 0ebf8283 2019-07-24 stsp if (commit_ref)
6298 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6299 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6300 0ebf8283 2019-07-24 stsp return err;
6303 0ebf8283 2019-07-24 stsp const struct got_error *
6304 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6305 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6307 3e3a69f1 2019-07-25 stsp if (fileindex)
6308 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6309 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6312 69844fba 2019-07-11 stsp static const struct got_error *
6313 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6315 69844fba 2019-07-11 stsp const struct got_error *err;
6316 69844fba 2019-07-11 stsp struct got_reference *ref;
6318 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6319 69844fba 2019-07-11 stsp if (err) {
6320 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6321 69844fba 2019-07-11 stsp return NULL;
6322 69844fba 2019-07-11 stsp return err;
6325 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6326 69844fba 2019-07-11 stsp got_ref_close(ref);
6327 69844fba 2019-07-11 stsp return err;
6330 69844fba 2019-07-11 stsp static const struct got_error *
6331 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6333 69844fba 2019-07-11 stsp const struct got_error *err;
6334 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6335 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6337 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6339 69844fba 2019-07-11 stsp goto done;
6340 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6342 69844fba 2019-07-11 stsp goto done;
6344 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6346 69844fba 2019-07-11 stsp goto done;
6347 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6349 69844fba 2019-07-11 stsp goto done;
6351 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6353 69844fba 2019-07-11 stsp goto done;
6354 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6356 69844fba 2019-07-11 stsp goto done;
6358 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6360 69844fba 2019-07-11 stsp goto done;
6361 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6363 69844fba 2019-07-11 stsp goto done;
6366 69844fba 2019-07-11 stsp free(tmp_branch_name);
6367 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6368 69844fba 2019-07-11 stsp free(branch_ref_name);
6369 69844fba 2019-07-11 stsp free(commit_ref_name);
6370 69844fba 2019-07-11 stsp return err;
6373 818c7501 2019-07-11 stsp const struct got_error *
6374 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6375 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6376 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6377 818c7501 2019-07-11 stsp struct got_repository *repo)
6379 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
6380 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6382 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6384 818c7501 2019-07-11 stsp return err;
6386 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6388 818c7501 2019-07-11 stsp goto done;
6390 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6392 818c7501 2019-07-11 stsp goto done;
6394 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6396 818c7501 2019-07-11 stsp goto done;
6398 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6400 3e3a69f1 2019-07-25 stsp if (fileindex)
6401 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6402 818c7501 2019-07-11 stsp free(new_head_commit_id);
6403 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6404 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6405 818c7501 2019-07-11 stsp err = unlockerr;
6406 818c7501 2019-07-11 stsp return err;
6409 818c7501 2019-07-11 stsp const struct got_error *
6410 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6411 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6412 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6413 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6415 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6416 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6417 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6418 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6419 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6420 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6422 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6424 818c7501 2019-07-11 stsp return err;
6426 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6427 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6429 818c7501 2019-07-11 stsp goto done;
6431 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6433 818c7501 2019-07-11 stsp goto done;
6436 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6437 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6438 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6440 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6442 818c7501 2019-07-11 stsp goto done;
6444 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6446 818c7501 2019-07-11 stsp goto done;
6448 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6449 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6451 ca355955 2019-07-12 stsp goto done;
6453 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6455 ca355955 2019-07-12 stsp goto done;
6457 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6459 818c7501 2019-07-11 stsp goto done;
6461 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6462 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6463 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6464 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6465 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6466 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6467 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6468 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6469 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6471 1f1abb7e 2019-08-08 stsp goto sync;
6473 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6474 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6476 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6477 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6478 ca355955 2019-07-12 stsp err = sync_err;
6480 818c7501 2019-07-11 stsp got_ref_close(resolved);
6481 a3a2faf2 2019-07-12 stsp free(tree_id);
6482 818c7501 2019-07-11 stsp free(commit_id);
6483 0ebf8283 2019-07-24 stsp if (fileindex)
6484 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6485 0ebf8283 2019-07-24 stsp free(fileindex_path);
6487 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6488 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6489 0ebf8283 2019-07-24 stsp err = unlockerr;
6490 0ebf8283 2019-07-24 stsp return err;
6493 0ebf8283 2019-07-24 stsp const struct got_error *
6494 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6495 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6496 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6497 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6499 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6500 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6501 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6502 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6503 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6504 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6505 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6506 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6508 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6509 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6510 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6511 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6513 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6515 0ebf8283 2019-07-24 stsp return err;
6517 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6519 0ebf8283 2019-07-24 stsp goto done;
6521 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6522 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6523 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6526 0ebf8283 2019-07-24 stsp goto done;
6528 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6530 0ebf8283 2019-07-24 stsp goto done;
6532 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6534 0ebf8283 2019-07-24 stsp goto done;
6536 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6537 0ebf8283 2019-07-24 stsp worktree);
6539 0ebf8283 2019-07-24 stsp goto done;
6541 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6544 0ebf8283 2019-07-24 stsp goto done;
6546 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6548 0ebf8283 2019-07-24 stsp goto done;
6550 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6552 0ebf8283 2019-07-24 stsp goto done;
6554 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6555 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6557 0ebf8283 2019-07-24 stsp goto done;
6558 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6560 0ebf8283 2019-07-24 stsp goto done;
6561 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6562 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6563 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6564 0ebf8283 2019-07-24 stsp goto done;
6567 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6568 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6570 0ebf8283 2019-07-24 stsp goto done;
6571 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6573 0ebf8283 2019-07-24 stsp goto done;
6575 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6577 0ebf8283 2019-07-24 stsp goto done;
6579 0ebf8283 2019-07-24 stsp free(fileindex_path);
6580 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6581 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6582 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6583 0ebf8283 2019-07-24 stsp if (wt_branch)
6584 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6585 0ebf8283 2019-07-24 stsp if (err) {
6586 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6587 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6588 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6590 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6591 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6592 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6594 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6595 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6596 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6597 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6599 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6601 0ebf8283 2019-07-24 stsp return err;
6604 0ebf8283 2019-07-24 stsp const struct got_error *
6605 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6606 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6608 3e3a69f1 2019-07-25 stsp if (fileindex)
6609 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6610 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6613 0ebf8283 2019-07-24 stsp const struct got_error *
6614 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6615 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6617 0ebf8283 2019-07-24 stsp const struct got_error *err;
6618 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6620 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6622 0ebf8283 2019-07-24 stsp return err;
6624 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6625 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6626 0ebf8283 2019-07-24 stsp return NULL;
6629 0ebf8283 2019-07-24 stsp const struct got_error *
6630 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6631 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6632 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6633 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6635 0ebf8283 2019-07-24 stsp const struct got_error *err;
6636 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6637 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6638 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6639 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6640 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6641 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6643 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6644 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6645 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6646 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6648 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6650 3e3a69f1 2019-07-25 stsp return err;
6652 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6654 f032f1f7 2019-08-04 stsp goto done;
6656 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6657 f032f1f7 2019-08-04 stsp &have_staged_files);
6658 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6659 f032f1f7 2019-08-04 stsp goto done;
6660 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6661 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6662 3e3a69f1 2019-07-25 stsp goto done;
6665 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6667 f032f1f7 2019-08-04 stsp goto done;
6669 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6671 0ebf8283 2019-07-24 stsp goto done;
6673 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6675 0ebf8283 2019-07-24 stsp goto done;
6677 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6678 0ebf8283 2019-07-24 stsp worktree);
6680 0ebf8283 2019-07-24 stsp goto done;
6682 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6684 0ebf8283 2019-07-24 stsp goto done;
6686 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6688 0ebf8283 2019-07-24 stsp goto done;
6689 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6691 0ebf8283 2019-07-24 stsp goto done;
6693 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6695 0ebf8283 2019-07-24 stsp goto done;
6696 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6698 0ebf8283 2019-07-24 stsp goto done;
6700 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6702 0ebf8283 2019-07-24 stsp goto done;
6704 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6705 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6706 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6707 0ebf8283 2019-07-24 stsp if (commit_ref)
6708 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6709 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6710 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6711 0ebf8283 2019-07-24 stsp if (err) {
6712 0ebf8283 2019-07-24 stsp free(*commit_id);
6713 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6714 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6715 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6716 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6717 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6718 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6720 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6721 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6722 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6724 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6726 0ebf8283 2019-07-24 stsp return err;
6729 0ebf8283 2019-07-24 stsp static const struct got_error *
6730 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6732 0ebf8283 2019-07-24 stsp const struct got_error *err;
6733 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6734 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6736 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6738 0ebf8283 2019-07-24 stsp goto done;
6739 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6741 0ebf8283 2019-07-24 stsp goto done;
6743 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6744 0ebf8283 2019-07-24 stsp worktree);
6746 0ebf8283 2019-07-24 stsp goto done;
6747 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6749 0ebf8283 2019-07-24 stsp goto done;
6751 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6753 0ebf8283 2019-07-24 stsp goto done;
6754 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6756 0ebf8283 2019-07-24 stsp goto done;
6758 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6760 0ebf8283 2019-07-24 stsp goto done;
6761 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6763 0ebf8283 2019-07-24 stsp goto done;
6765 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6766 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6767 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6768 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6769 0ebf8283 2019-07-24 stsp return err;
6772 0ebf8283 2019-07-24 stsp const struct got_error *
6773 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
6774 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6775 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
6776 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6778 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6779 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6780 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6781 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6782 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6784 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6786 0ebf8283 2019-07-24 stsp return err;
6788 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6789 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6791 0ebf8283 2019-07-24 stsp goto done;
6793 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6795 0ebf8283 2019-07-24 stsp goto done;
6797 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6799 0ebf8283 2019-07-24 stsp goto done;
6801 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6802 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6804 0ebf8283 2019-07-24 stsp goto done;
6806 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6808 0ebf8283 2019-07-24 stsp goto done;
6810 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6812 0ebf8283 2019-07-24 stsp goto done;
6814 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6815 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6816 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6817 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6818 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6819 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6820 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6821 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6822 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6824 1f1abb7e 2019-08-08 stsp goto sync;
6826 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6827 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6829 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6830 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6831 0ebf8283 2019-07-24 stsp err = sync_err;
6833 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6834 0ebf8283 2019-07-24 stsp free(tree_id);
6835 818c7501 2019-07-11 stsp free(fileindex_path);
6837 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6838 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6839 818c7501 2019-07-11 stsp err = unlockerr;
6840 818c7501 2019-07-11 stsp return err;
6843 0ebf8283 2019-07-24 stsp const struct got_error *
6844 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6845 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6846 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6848 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
6849 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6850 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6852 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6854 0ebf8283 2019-07-24 stsp return err;
6856 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6857 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
6859 0ebf8283 2019-07-24 stsp goto done;
6861 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
6863 0ebf8283 2019-07-24 stsp goto done;
6865 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
6867 0ebf8283 2019-07-24 stsp goto done;
6869 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6871 0ebf8283 2019-07-24 stsp goto done;
6873 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6875 3e3a69f1 2019-07-25 stsp if (fileindex)
6876 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6877 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
6878 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6879 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6880 0ebf8283 2019-07-24 stsp err = unlockerr;
6881 0ebf8283 2019-07-24 stsp return err;
6884 0ebf8283 2019-07-24 stsp const struct got_error *
6885 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6886 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6888 0ebf8283 2019-07-24 stsp const struct got_error *err;
6889 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6891 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6893 0ebf8283 2019-07-24 stsp return err;
6895 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6897 0ebf8283 2019-07-24 stsp goto done;
6899 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6901 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6902 2822a352 2019-10-15 stsp return err;
6905 2822a352 2019-10-15 stsp const struct got_error *
6906 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6907 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6908 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
6909 2822a352 2019-10-15 stsp struct got_repository *repo)
6911 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
6912 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6913 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
6915 2822a352 2019-10-15 stsp *fileindex = NULL;
6916 2822a352 2019-10-15 stsp *branch_ref = NULL;
6917 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6919 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
6921 2822a352 2019-10-15 stsp return err;
6923 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6924 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6925 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
6926 2822a352 2019-10-15 stsp "update -b or different branch name required");
6927 2822a352 2019-10-15 stsp goto done;
6930 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6932 2822a352 2019-10-15 stsp goto done;
6934 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
6935 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
6936 2822a352 2019-10-15 stsp ok_arg.repo = repo;
6937 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6940 2822a352 2019-10-15 stsp goto done;
6942 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
6944 2822a352 2019-10-15 stsp goto done;
6946 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
6947 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
6949 2822a352 2019-10-15 stsp if (err) {
6950 2822a352 2019-10-15 stsp if (*branch_ref) {
6951 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
6952 2822a352 2019-10-15 stsp *branch_ref = NULL;
6954 2822a352 2019-10-15 stsp if (*base_branch_ref) {
6955 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
6956 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6958 2822a352 2019-10-15 stsp if (*fileindex) {
6959 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
6960 2822a352 2019-10-15 stsp *fileindex = NULL;
6962 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
6964 0cb83759 2019-08-03 stsp return err;
6967 2822a352 2019-10-15 stsp const struct got_error *
6968 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
6969 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6970 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6971 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6972 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6974 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6975 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6976 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6978 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6980 2822a352 2019-10-15 stsp goto done;
6982 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6984 2822a352 2019-10-15 stsp goto done;
6986 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6987 2822a352 2019-10-15 stsp worktree->path_prefix);
6989 2822a352 2019-10-15 stsp goto done;
6991 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6993 2822a352 2019-10-15 stsp goto done;
6995 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6996 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6998 2822a352 2019-10-15 stsp goto sync;
7000 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7002 2822a352 2019-10-15 stsp goto sync;
7004 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7006 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7007 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7008 2822a352 2019-10-15 stsp err = sync_err;
7011 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(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(branch_ref);
7016 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7017 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7018 2822a352 2019-10-15 stsp err = unlockerr;
7019 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7021 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7022 2822a352 2019-10-15 stsp free(fileindex_path);
7023 2822a352 2019-10-15 stsp free(tree_id);
7025 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7026 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7027 2822a352 2019-10-15 stsp err = unlockerr;
7028 2822a352 2019-10-15 stsp return err;
7031 2822a352 2019-10-15 stsp const struct got_error *
7032 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7033 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7034 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7036 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7038 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7040 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7042 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(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(branch_ref);
7047 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7048 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7049 8b692cd0 2019-10-21 stsp err = unlockerr;
7050 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7052 8b692cd0 2019-10-21 stsp return err;
7055 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7056 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7057 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7058 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7059 2db2652d 2019-08-07 stsp struct got_repository *repo;
7060 2db2652d 2019-08-07 stsp int have_changes;
7063 2db2652d 2019-08-07 stsp const struct got_error *
7064 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7065 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7066 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7067 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7069 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7070 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7071 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7072 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7073 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7074 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7076 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7077 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7078 8b13ce36 2019-08-08 stsp return NULL;
7079 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7080 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7082 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7083 735ef5ac 2019-08-03 stsp if (ie == NULL)
7084 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7086 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7087 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7088 735ef5ac 2019-08-03 stsp relpath) == -1)
7089 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7091 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7092 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7093 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7094 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7097 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7098 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7099 3aa5969e 2019-08-06 stsp goto done;
7100 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7101 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7102 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7103 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7104 735ef5ac 2019-08-03 stsp goto done;
7107 2db2652d 2019-08-07 stsp a->have_changes = 1;
7109 735ef5ac 2019-08-03 stsp p = in_repo_path;
7110 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7112 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7113 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7114 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7116 735ef5ac 2019-08-03 stsp free(in_repo_path);
7117 dc424a06 2019-08-07 stsp return err;
7120 2db2652d 2019-08-07 stsp struct stage_path_arg {
7121 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7122 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7123 2db2652d 2019-08-07 stsp struct got_repository *repo;
7124 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7125 2db2652d 2019-08-07 stsp void *status_arg;
7126 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7127 2db2652d 2019-08-07 stsp void *patch_arg;
7128 7b5dc508 2019-10-28 stsp int staged_something;
7129 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7132 2db2652d 2019-08-07 stsp static const struct got_error *
7133 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7134 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7135 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7136 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7138 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7139 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7140 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7141 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7142 0cb83759 2019-08-03 stsp uint32_t stage;
7143 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7144 0aeb8099 2020-07-23 stsp struct stat sb;
7146 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7147 8b13ce36 2019-08-08 stsp return NULL;
7149 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7150 d3e7c587 2019-08-03 stsp if (ie == NULL)
7151 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7153 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7154 2db2652d 2019-08-07 stsp relpath)== -1)
7155 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7157 0cb83759 2019-08-03 stsp switch (status) {
7158 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7159 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7160 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7161 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7162 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7165 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7166 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7167 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7168 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7169 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7172 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7175 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7176 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7177 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7178 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7179 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7183 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7184 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7187 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7188 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7189 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7190 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7192 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7193 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7194 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7195 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7196 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7197 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7198 35213c7c 2020-07-23 stsp ssize_t target_len;
7199 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7200 35213c7c 2020-07-23 stsp sizeof(target_path));
7201 35213c7c 2020-07-23 stsp if (target_len == -1) {
7202 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7203 35213c7c 2020-07-23 stsp ondisk_path);
7206 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7207 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7208 35213c7c 2020-07-23 stsp a->worktree->root_path);
7211 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7212 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7213 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7217 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7218 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7219 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7221 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7222 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7224 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7225 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7227 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7228 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7230 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7231 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7232 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7234 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7235 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7237 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7238 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7239 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7240 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7243 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7245 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7246 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7250 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7251 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7252 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7253 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7255 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7256 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7259 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7261 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7262 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7264 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7265 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7268 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7272 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7273 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7274 dc424a06 2019-08-07 stsp free(path_content);
7275 2db2652d 2019-08-07 stsp free(ondisk_path);
7276 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7277 0ebf8283 2019-07-24 stsp return err;
7280 0cb83759 2019-08-03 stsp const struct got_error *
7281 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7282 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7283 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7284 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7285 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
7287 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7288 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7289 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7290 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7291 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7292 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7293 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7294 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7296 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7298 0cb83759 2019-08-03 stsp return err;
7300 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7301 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7303 735ef5ac 2019-08-03 stsp goto done;
7304 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7306 735ef5ac 2019-08-03 stsp goto done;
7307 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7309 0cb83759 2019-08-03 stsp goto done;
7311 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7312 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7313 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7314 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7315 2db2652d 2019-08-07 stsp oka.repo = repo;
7316 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7317 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7318 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7319 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7321 735ef5ac 2019-08-03 stsp goto done;
7323 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7324 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7325 2db2652d 2019-08-07 stsp goto done;
7328 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7329 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7330 2db2652d 2019-08-07 stsp spa.repo = repo;
7331 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7332 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7333 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7334 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7335 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7336 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
7337 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7338 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7339 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7341 2db2652d 2019-08-07 stsp goto done;
7343 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7344 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7345 7b5dc508 2019-10-28 stsp goto done;
7348 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7349 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7350 0cb83759 2019-08-03 stsp err = sync_err;
7352 735ef5ac 2019-08-03 stsp if (head_ref)
7353 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7354 735ef5ac 2019-08-03 stsp free(head_commit_id);
7355 0cb83759 2019-08-03 stsp free(fileindex_path);
7356 0cb83759 2019-08-03 stsp if (fileindex)
7357 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7358 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7359 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7360 0cb83759 2019-08-03 stsp err = unlockerr;
7361 0cb83759 2019-08-03 stsp return err;
7364 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7365 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7366 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7367 ad493afc 2019-08-03 stsp struct got_repository *repo;
7368 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7369 ad493afc 2019-08-03 stsp void *progress_arg;
7370 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7371 2e1f37b0 2019-08-08 stsp void *patch_arg;
7374 2e1f37b0 2019-08-08 stsp static const struct got_error *
7375 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7376 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7377 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7378 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7379 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7381 2e1f37b0 2019-08-08 stsp const struct got_error *err;
7382 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7383 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7384 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7385 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
7386 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
7387 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
7388 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
7389 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
7390 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
7391 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
7393 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7394 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7396 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7398 2e1f37b0 2019-08-08 stsp return err;
7399 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7401 2e1f37b0 2019-08-08 stsp goto done;
7403 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7405 2e1f37b0 2019-08-08 stsp goto done;
7407 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7409 2e1f37b0 2019-08-08 stsp goto done;
7411 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7413 2e1f37b0 2019-08-08 stsp goto done;
7415 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7417 2e1f37b0 2019-08-08 stsp goto done;
7419 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7421 2e1f37b0 2019-08-08 stsp goto done;
7423 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
7424 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
7425 2e1f37b0 2019-08-08 stsp goto done;
7428 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
7429 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
7430 2e1f37b0 2019-08-08 stsp goto done;
7433 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
7434 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
7436 2e1f37b0 2019-08-08 stsp goto done;
7438 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7439 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7441 2e1f37b0 2019-08-08 stsp goto done;
7442 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7443 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7445 2e1f37b0 2019-08-08 stsp goto done;
7447 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7448 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7449 2e1f37b0 2019-08-08 stsp goto done;
7451 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7452 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7453 2e1f37b0 2019-08-08 stsp goto done;
7455 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
7456 2e1f37b0 2019-08-08 stsp int choice;
7457 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
7458 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
7459 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
7460 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
7462 2e1f37b0 2019-08-08 stsp goto done;
7463 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7464 2e1f37b0 2019-08-08 stsp have_content = 1;
7466 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7467 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7470 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7471 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7472 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7474 2e1f37b0 2019-08-08 stsp free(label1);
7476 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7477 2e1f37b0 2019-08-08 stsp if (staged_blob)
7478 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7479 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7480 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7481 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7482 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7483 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7484 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7485 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7486 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7487 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7488 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7489 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7490 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7491 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7492 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7493 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7494 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7495 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7496 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7497 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7499 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
7500 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7501 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7502 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7503 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7504 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7505 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7507 2e1f37b0 2019-08-08 stsp free(args);
7509 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
7512 2e1f37b0 2019-08-08 stsp if (changes)
7513 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
7514 2e1f37b0 2019-08-08 stsp free(path1);
7515 2e1f37b0 2019-08-08 stsp free(path2);
7516 fda8017d 2020-07-23 stsp return err;
7519 fda8017d 2020-07-23 stsp static const struct got_error *
7520 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
7521 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
7522 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7523 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
7524 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
7525 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7526 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7528 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
7529 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
7530 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
7531 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
7532 fda8017d 2020-07-23 stsp FILE *f = NULL;
7533 fda8017d 2020-07-23 stsp struct stat sb;
7535 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
7536 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
7537 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
7539 fda8017d 2020-07-23 stsp return err;
7541 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
7542 fda8017d 2020-07-23 stsp return NULL;
7544 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
7545 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
7546 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
7548 fda8017d 2020-07-23 stsp goto done;
7551 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
7552 fda8017d 2020-07-23 stsp if (f == NULL) {
7553 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
7554 fda8017d 2020-07-23 stsp path_unstaged_content);
7555 fda8017d 2020-07-23 stsp goto done;
7557 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
7558 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
7559 fda8017d 2020-07-23 stsp goto done;
7561 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
7562 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7563 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
7565 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
7566 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
7567 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
7568 fda8017d 2020-07-23 stsp goto done;
7570 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
7571 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
7572 fda8017d 2020-07-23 stsp goto done;
7574 fda8017d 2020-07-23 stsp link_target[r] = '\0';
7575 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
7576 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
7577 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
7578 fda8017d 2020-07-23 stsp progress_arg);
7580 fda8017d 2020-07-23 stsp int local_changes_subsumed;
7581 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
7582 fda8017d 2020-07-23 stsp blob_base, ondisk_path, ie->path,
7583 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
7584 fda8017d 2020-07-23 stsp path_unstaged_content, label_orig, "unstaged",
7585 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
7588 fda8017d 2020-07-23 stsp goto done;
7590 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
7591 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7592 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
7594 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7596 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
7597 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
7598 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7599 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7600 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
7601 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7602 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7603 fda8017d 2020-07-23 stsp if (f && fclose(f) != 0 && err == NULL)
7604 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7605 fda8017d 2020-07-23 stsp free(path_unstaged_content);
7606 fda8017d 2020-07-23 stsp free(path_new_staged_content);
7607 2e1f37b0 2019-08-08 stsp return err;
7610 ad493afc 2019-08-03 stsp static const struct got_error *
7611 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7612 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7613 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7614 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7616 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7617 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7618 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7619 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7620 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
7621 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7622 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7623 9bc94a15 2019-08-03 stsp struct stat sb;
7625 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7626 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7627 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7628 2e1f37b0 2019-08-08 stsp return NULL;
7630 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7631 ad493afc 2019-08-03 stsp if (ie == NULL)
7632 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7634 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7636 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7638 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7639 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7641 f69721c3 2019-10-21 stsp goto done;
7642 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7643 f69721c3 2019-10-21 stsp id_str) == -1) {
7644 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7645 f69721c3 2019-10-21 stsp goto done;
7648 ad493afc 2019-08-03 stsp switch (staged_status) {
7649 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7650 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7651 ad493afc 2019-08-03 stsp blob_id, 8192);
7654 ad493afc 2019-08-03 stsp /* fall through */
7655 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7656 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7657 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7658 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7659 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7660 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7663 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7666 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
7667 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
7668 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
7669 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
7670 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
7671 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7674 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7675 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7678 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
7679 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
7680 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
7681 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7682 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
7683 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
7684 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
7685 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7686 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
7688 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
7689 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7690 36bf999c 2020-07-23 stsp char *staged_target;
7691 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
7692 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
7694 36bf999c 2020-07-23 stsp goto done;
7695 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
7696 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
7697 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
7698 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
7699 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
7700 36bf999c 2020-07-23 stsp free(staged_target);
7702 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
7703 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
7704 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
7705 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
7706 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
7707 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7708 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
7712 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
7715 ad493afc 2019-08-03 stsp if (err == NULL)
7716 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
7717 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
7719 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
7720 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7721 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7722 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7723 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7726 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7728 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7729 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7733 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7734 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
7735 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
7738 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
7742 ad493afc 2019-08-03 stsp free(ondisk_path);
7743 ad493afc 2019-08-03 stsp if (blob_base)
7744 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
7745 ad493afc 2019-08-03 stsp if (blob_staged)
7746 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
7747 f69721c3 2019-10-21 stsp free(id_str);
7748 f69721c3 2019-10-21 stsp free(label_orig);
7749 ad493afc 2019-08-03 stsp return err;
7752 ad493afc 2019-08-03 stsp const struct got_error *
7753 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
7754 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
7755 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7756 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7757 ad493afc 2019-08-03 stsp struct got_repository *repo)
7759 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7760 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7761 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7762 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
7763 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
7765 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7767 ad493afc 2019-08-03 stsp return err;
7769 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7771 ad493afc 2019-08-03 stsp goto done;
7773 ad493afc 2019-08-03 stsp upa.worktree = worktree;
7774 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
7775 ad493afc 2019-08-03 stsp upa.repo = repo;
7776 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
7777 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
7778 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
7779 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
7780 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7781 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7782 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
7784 ad493afc 2019-08-03 stsp goto done;
7787 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7788 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
7789 ad493afc 2019-08-03 stsp err = sync_err;
7791 ad493afc 2019-08-03 stsp free(fileindex_path);
7792 ad493afc 2019-08-03 stsp if (fileindex)
7793 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
7794 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7795 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
7796 ad493afc 2019-08-03 stsp err = unlockerr;
7797 ad493afc 2019-08-03 stsp return err;
7800 b2118c49 2020-07-28 stsp struct report_file_info_arg {
7801 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
7802 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
7803 b2118c49 2020-07-28 stsp void *info_arg;
7804 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
7805 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
7806 b2118c49 2020-07-28 stsp void *cancel_arg;
7809 b2118c49 2020-07-28 stsp static const struct got_error *
7810 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
7812 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
7813 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
7814 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
7815 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
7816 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
7817 b2118c49 2020-07-28 stsp int stage;
7819 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
7820 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
7822 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
7823 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
7824 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
7827 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
7828 b2118c49 2020-07-28 stsp return NULL;
7830 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
7831 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
7832 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
7834 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
7835 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
7836 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
7837 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
7838 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
7839 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
7842 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
7843 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
7844 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
7847 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
7848 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
7851 b2118c49 2020-07-28 stsp const struct got_error *
7852 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
7853 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
7854 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
7855 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7858 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
7859 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
7860 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
7861 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
7863 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
7865 b2118c49 2020-07-28 stsp return err;
7867 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7869 b2118c49 2020-07-28 stsp goto done;
7871 b2118c49 2020-07-28 stsp arg.worktree = worktree;
7872 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
7873 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
7874 b2118c49 2020-07-28 stsp arg.paths = paths;
7875 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
7876 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
7877 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
7880 b2118c49 2020-07-28 stsp free(fileindex_path);
7881 b2118c49 2020-07-28 stsp if (fileindex)
7882 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
7883 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
7884 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
7885 b2118c49 2020-07-28 stsp err = unlockerr;
7886 b2118c49 2020-07-28 stsp return err;
