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>
19 d1f6d47b 2019-02-04 stsp #include <dirent.h>
20 12ce7a6c 2019-08-12 stsp #include <limits.h>
21 f5c49f82 2019-01-06 stsp #include <stddef.h>
22 86c3caaf 2018-03-09 stsp #include <string.h>
23 86c3caaf 2018-03-09 stsp #include <stdio.h>
24 86c3caaf 2018-03-09 stsp #include <stdlib.h>
25 303e14b5 2019-09-23 stsp #include <time.h>
26 86c3caaf 2018-03-09 stsp #include <fcntl.h>
27 86c3caaf 2018-03-09 stsp #include <errno.h>
28 86c3caaf 2018-03-09 stsp #include <unistd.h>
29 9d31a1d8 2018-03-11 stsp #include <zlib.h>
30 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
31 512f0d0e 2019-01-02 stsp #include <libgen.h>
32 92a9e85d 2021-09-24 thomas #include <uuid.h>
34 dd038bc6 2021-09-21 thomas.ad #include "got_compat.h"
36 86c3caaf 2018-03-09 stsp #include "got_error.h"
37 86c3caaf 2018-03-09 stsp #include "got_repository.h"
38 5261c201 2018-04-01 stsp #include "got_reference.h"
39 9d31a1d8 2018-03-11 stsp #include "got_object.h"
40 1dd54920 2019-05-11 stsp #include "got_path.h"
41 e6209546 2019-08-22 stsp #include "got_cancel.h"
42 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 234035bc 2019-06-01 stsp #include "got_diff.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
49 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
52 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
53 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
54 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
55 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
56 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
59 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
62 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
63 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
65 99724ed4 2018-03-10 stsp static const struct got_error *
66 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
68 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
71 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
72 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
74 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
79 507dc3bb 2018-12-29 stsp static const struct got_error *
80 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
82 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
83 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
84 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
85 507dc3bb 2018-12-29 stsp char *path = NULL;
87 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
88 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
89 507dc3bb 2018-12-29 stsp path = NULL;
93 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
97 507dc3bb 2018-12-29 stsp if (content) {
98 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
99 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
100 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
105 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
106 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
107 2a57020b 2019-02-20 stsp unlink(tmppath);
112 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
113 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
114 230a42bd 2019-05-11 jcs free(tmppath);
115 09fe317a 2018-03-11 stsp return err;
118 024e9686 2019-05-14 stsp static const struct got_error *
119 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
121 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
122 024e9686 2019-05-14 stsp char *refstr = NULL;
124 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
125 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
126 024e9686 2019-05-14 stsp if (refstr == NULL)
127 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
129 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
130 024e9686 2019-05-14 stsp if (refstr == NULL)
131 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
133 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
134 024e9686 2019-05-14 stsp free(refstr);
135 024e9686 2019-05-14 stsp return err;
138 86c3caaf 2018-03-09 stsp const struct got_error *
139 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
140 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
142 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
143 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
144 ec22038e 2019-03-10 stsp uuid_t uuid;
145 ec22038e 2019-03-10 stsp uint32_t uuid_status;
146 65596e15 2018-12-24 stsp int obj_type;
147 7ac97322 2018-03-11 stsp char *path_got = NULL;
148 1451e70d 2018-03-10 stsp char *formatstr = NULL;
149 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
150 65596e15 2018-12-24 stsp char *basestr = NULL;
151 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
153 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
154 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
158 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
160 65596e15 2018-12-24 stsp return err;
161 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
163 65596e15 2018-12-24 stsp return err;
164 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
165 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
167 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
168 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
169 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
172 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
173 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
174 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
178 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
179 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
180 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
183 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
184 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
188 056e7441 2018-03-11 stsp /* Create an empty lock file. */
189 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
193 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
194 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
198 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
199 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
203 65596e15 2018-12-24 stsp /* Record our base commit. */
204 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
207 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
211 1451e70d 2018-03-10 stsp /* Store path to repository. */
212 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
213 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
217 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
218 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
219 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
223 ec22038e 2019-03-10 stsp /* Generate UUID. */
224 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
225 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
226 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
229 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
230 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
231 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
234 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
238 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
239 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
240 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
243 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
248 65596e15 2018-12-24 stsp free(commit_id);
249 7ac97322 2018-03-11 stsp free(path_got);
250 1451e70d 2018-03-10 stsp free(formatstr);
251 0bb8a95e 2018-03-12 stsp free(absprefix);
252 65596e15 2018-12-24 stsp free(basestr);
253 ec22038e 2019-03-10 stsp free(uuidstr);
254 86c3caaf 2018-03-09 stsp return err;
257 247140b2 2019-02-05 stsp const struct got_error *
258 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
259 e5dc7198 2018-12-29 stsp const char *path_prefix)
261 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
263 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
264 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
265 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
267 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
268 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
269 e5dc7198 2018-12-29 stsp free(absprefix);
270 e5dc7198 2018-12-29 stsp return NULL;
273 bc70eb79 2019-05-09 stsp const char *
274 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
276 36a38700 2019-05-10 stsp return worktree->head_ref_name;
279 024e9686 2019-05-14 stsp const struct got_error *
280 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
281 024e9686 2019-05-14 stsp struct got_reference *head_ref)
283 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
284 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
286 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
287 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
288 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
289 024e9686 2019-05-14 stsp path_got = NULL;
293 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
294 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
295 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
299 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
303 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
304 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
306 024e9686 2019-05-14 stsp free(path_got);
308 024e9686 2019-05-14 stsp free(head_ref_name);
309 024e9686 2019-05-14 stsp return err;
312 b72f483a 2019-02-05 stsp struct got_object_id *
313 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
315 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
318 507dc3bb 2018-12-29 stsp const struct got_error *
319 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
320 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
322 507dc3bb 2018-12-29 stsp const struct got_error *err;
323 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
324 507dc3bb 2018-12-29 stsp char *id_str = NULL;
325 507dc3bb 2018-12-29 stsp char *path_got = NULL;
327 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
328 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
329 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
330 507dc3bb 2018-12-29 stsp path_got = NULL;
334 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
336 507dc3bb 2018-12-29 stsp return err;
338 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
339 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
343 507dc3bb 2018-12-29 stsp /* Record our base commit. */
344 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
347 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
351 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
352 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
353 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
354 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
359 507dc3bb 2018-12-29 stsp got_object_close(obj);
360 507dc3bb 2018-12-29 stsp free(id_str);
361 507dc3bb 2018-12-29 stsp free(path_got);
362 507dc3bb 2018-12-29 stsp return err;
365 50b0790e 2020-09-11 stsp const struct got_gotconfig *
366 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
368 50b0790e 2020-09-11 stsp return worktree->gotconfig;
371 9d31a1d8 2018-03-11 stsp static const struct got_error *
372 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
374 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
375 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
376 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
377 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
378 86c3caaf 2018-03-09 stsp return NULL;
381 21908da4 2019-01-13 stsp static const struct got_error *
382 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
384 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
385 4a1ddfc2 2019-01-12 stsp char *abspath;
387 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
388 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
390 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
391 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
392 ddcd8544 2019-03-11 stsp struct stat sb;
393 ddcd8544 2019-03-11 stsp err = NULL;
394 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
395 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
396 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
397 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
398 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
401 4a1ddfc2 2019-01-12 stsp free(abspath);
402 68c76935 2019-02-19 stsp return err;
405 68c76935 2019-02-19 stsp static const struct got_error *
406 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
408 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
409 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
410 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
411 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
416 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
417 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
418 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
421 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
422 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
423 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
426 68c76935 2019-02-19 stsp if (flen1 == 0) {
427 68c76935 2019-02-19 stsp if (flen2 != 0)
430 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
431 68c76935 2019-02-19 stsp if (flen1 != 0)
434 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
435 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
445 68c76935 2019-02-19 stsp return err;
448 68c76935 2019-02-19 stsp static const struct got_error *
449 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
451 68c76935 2019-02-19 stsp struct stat sb;
452 68c76935 2019-02-19 stsp size_t size1, size2;
456 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
457 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
458 68c76935 2019-02-19 stsp size1 = sb.st_size;
460 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
461 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
462 68c76935 2019-02-19 stsp size2 = sb.st_size;
464 68c76935 2019-02-19 stsp if (size1 != size2) {
466 68c76935 2019-02-19 stsp return NULL;
469 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
470 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
471 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
472 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
474 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
477 24f136e0 2021-11-20 thomas static const struct got_error *
478 24f136e0 2021-11-20 thomas copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
480 24f136e0 2021-11-20 thomas uint8_t fbuf[65536];
481 24f136e0 2021-11-20 thomas size_t flen;
482 24f136e0 2021-11-20 thomas ssize_t outlen;
484 24f136e0 2021-11-20 thomas *outsize = 0;
486 24f136e0 2021-11-20 thomas if (fseek(f, 0L, SEEK_SET) == -1)
487 24f136e0 2021-11-20 thomas return got_ferror(f, GOT_ERR_IO);
489 24f136e0 2021-11-20 thomas for (;;) {
490 24f136e0 2021-11-20 thomas flen = fread(fbuf, 1, sizeof(fbuf), f);
491 24f136e0 2021-11-20 thomas if (flen == 0) {
492 24f136e0 2021-11-20 thomas if (ferror(f))
493 24f136e0 2021-11-20 thomas return got_error_from_errno("fread");
494 24f136e0 2021-11-20 thomas if (feof(f))
497 24f136e0 2021-11-20 thomas outlen = write(outfd, fbuf, flen);
498 24f136e0 2021-11-20 thomas if (outlen == -1)
499 24f136e0 2021-11-20 thomas return got_error_from_errno("write");
500 24f136e0 2021-11-20 thomas if (outlen != flen)
501 24f136e0 2021-11-20 thomas return got_error(GOT_ERR_IO);
502 24f136e0 2021-11-20 thomas *outsize += outlen;
505 24f136e0 2021-11-20 thomas return NULL;
508 24f136e0 2021-11-20 thomas static const struct got_error *
509 24f136e0 2021-11-20 thomas merge_binary_file(int *overlapcnt, int merged_fd,
510 24f136e0 2021-11-20 thomas FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
511 24f136e0 2021-11-20 thomas const char *label_deriv, const char *label_orig, const char *label_deriv2,
512 24f136e0 2021-11-20 thomas const char *ondisk_path)
514 24f136e0 2021-11-20 thomas const struct got_error *err = NULL;
515 24f136e0 2021-11-20 thomas int same_content, changed_deriv, changed_deriv2;
516 24f136e0 2021-11-20 thomas int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
517 24f136e0 2021-11-20 thomas off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
518 24f136e0 2021-11-20 thomas char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
519 24f136e0 2021-11-20 thomas char *base_path_orig = NULL, *base_path_deriv = NULL;
520 24f136e0 2021-11-20 thomas char *base_path_deriv2 = NULL;
522 24f136e0 2021-11-20 thomas *overlapcnt = 0;
524 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_deriv2);
526 24f136e0 2021-11-20 thomas return err;
528 24f136e0 2021-11-20 thomas if (same_content)
529 24f136e0 2021-11-20 thomas return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
531 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_orig);
533 24f136e0 2021-11-20 thomas return err;
534 24f136e0 2021-11-20 thomas changed_deriv = !same_content;
535 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv2, f_orig);
537 24f136e0 2021-11-20 thomas return err;
538 24f136e0 2021-11-20 thomas changed_deriv2 = !same_content;
540 24f136e0 2021-11-20 thomas if (changed_deriv && changed_deriv2) {
541 24f136e0 2021-11-20 thomas *overlapcnt = 1;
542 24f136e0 2021-11-20 thomas if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
543 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
544 24f136e0 2021-11-20 thomas goto done;
546 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
547 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
548 24f136e0 2021-11-20 thomas goto done;
550 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
551 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
552 24f136e0 2021-11-20 thomas goto done;
554 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_orig, &fd_orig,
555 24f136e0 2021-11-20 thomas base_path_orig);
557 24f136e0 2021-11-20 thomas goto done;
558 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
559 24f136e0 2021-11-20 thomas base_path_deriv);
561 24f136e0 2021-11-20 thomas goto done;
562 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
563 24f136e0 2021-11-20 thomas base_path_deriv2);
565 24f136e0 2021-11-20 thomas goto done;
566 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
568 24f136e0 2021-11-20 thomas goto done;
569 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
571 24f136e0 2021-11-20 thomas goto done;
572 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
574 24f136e0 2021-11-20 thomas goto done;
575 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "Binary files differ and cannot be "
576 24f136e0 2021-11-20 thomas "merged automatically:\n") < 0) {
577 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
578 24f136e0 2021-11-20 thomas goto done;
580 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
581 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_BEGIN,
582 24f136e0 2021-11-20 thomas label_deriv ? " " : "",
583 24f136e0 2021-11-20 thomas label_deriv ? label_deriv : "",
584 24f136e0 2021-11-20 thomas path_deriv) < 0) {
585 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
586 24f136e0 2021-11-20 thomas goto done;
588 24f136e0 2021-11-20 thomas if (size_orig > 0) {
589 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
590 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_ORIG,
591 24f136e0 2021-11-20 thomas label_orig ? " " : "",
592 24f136e0 2021-11-20 thomas label_orig ? label_orig : "",
593 24f136e0 2021-11-20 thomas path_orig) < 0) {
594 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
595 24f136e0 2021-11-20 thomas goto done;
598 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
599 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_SEP,
600 24f136e0 2021-11-20 thomas path_deriv2,
601 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_END,
602 24f136e0 2021-11-20 thomas label_deriv2 ? " " : "",
603 24f136e0 2021-11-20 thomas label_deriv2 ? label_deriv2 : "") < 0) {
604 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
605 24f136e0 2021-11-20 thomas goto done;
607 24f136e0 2021-11-20 thomas } else if (changed_deriv)
608 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
609 24f136e0 2021-11-20 thomas else if (changed_deriv2)
610 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
612 24f136e0 2021-11-20 thomas if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
613 24f136e0 2021-11-20 thomas err == NULL)
614 24f136e0 2021-11-20 thomas err = got_error_from_errno2("unlink", path_orig);
615 24f136e0 2021-11-20 thomas if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
616 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_orig);
617 24f136e0 2021-11-20 thomas if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
618 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv);
619 24f136e0 2021-11-20 thomas if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
620 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv2);
621 24f136e0 2021-11-20 thomas free(path_orig);
622 24f136e0 2021-11-20 thomas free(path_deriv);
623 24f136e0 2021-11-20 thomas free(path_deriv2);
624 24f136e0 2021-11-20 thomas free(base_path_orig);
625 24f136e0 2021-11-20 thomas free(base_path_deriv);
626 24f136e0 2021-11-20 thomas free(base_path_deriv2);
627 24f136e0 2021-11-20 thomas return err;
631 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
632 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
633 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
634 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
635 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
637 6353ad76 2019-02-08 stsp static const struct got_error *
638 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
639 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
640 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
641 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
642 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
643 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
645 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
646 6353ad76 2019-02-08 stsp int merged_fd = -1;
647 db590691 2021-06-02 stsp FILE *f_merged = NULL;
648 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
649 234035bc 2019-06-01 stsp int overlapcnt = 0;
650 3524bbf9 2020-10-20 stsp char *parent = NULL;
652 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
654 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
656 3524bbf9 2020-10-20 stsp return err;
658 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
659 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
663 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
667 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
668 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
669 24f136e0 2021-11-20 thomas if (err) {
670 24f136e0 2021-11-20 thomas if (err->code != GOT_ERR_FILE_BINARY)
671 24f136e0 2021-11-20 thomas goto done;
672 24f136e0 2021-11-20 thomas err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
673 24f136e0 2021-11-20 thomas f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
674 24f136e0 2021-11-20 thomas ondisk_path);
676 24f136e0 2021-11-20 thomas goto done;
679 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
680 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
684 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
685 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
689 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
690 db590691 2021-06-02 stsp if (f_merged == NULL) {
691 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
694 db590691 2021-06-02 stsp merged_fd = -1;
696 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
697 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
698 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
704 db590691 2021-06-02 stsp if (fchmod(fileno(f_merged), st_mode) != 0) {
705 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
709 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
710 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
711 230a42bd 2019-05-11 jcs ondisk_path);
716 fdcb7daf 2019-12-15 stsp if (merged_path)
717 fdcb7daf 2019-12-15 stsp unlink(merged_path);
719 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
720 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
721 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
722 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
723 6353ad76 2019-02-08 stsp free(merged_path);
724 af54ae4a 2019-02-19 stsp free(base_path);
725 3524bbf9 2020-10-20 stsp free(parent);
726 af57b12a 2020-07-23 stsp return err;
729 af57b12a 2020-07-23 stsp static const struct got_error *
730 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
731 af57b12a 2020-07-23 stsp size_t target_len)
733 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
734 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
735 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
736 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
737 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
738 af57b12a 2020-07-23 stsp ondisk_path);
739 af57b12a 2020-07-23 stsp return NULL;
743 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
744 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
745 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
746 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
748 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
749 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
751 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
752 993e2a1b 2020-07-23 stsp * has deleted this symlink.
754 11cc08c1 2020-07-23 stsp static const struct got_error *
755 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
756 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
757 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
759 11cc08c1 2020-07-23 stsp const struct got_error *err;
760 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
761 11cc08c1 2020-07-23 stsp FILE *f = NULL;
763 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
765 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
767 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
768 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
769 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
773 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
775 3818e3c4 2020-11-01 naddy goto done;
777 3818e3c4 2020-11-01 naddy if (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
778 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
782 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
783 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
784 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
785 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
786 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
787 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
788 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
789 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
790 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
791 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
795 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
796 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
799 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
800 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
804 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
805 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
806 11cc08c1 2020-07-23 stsp free(path);
807 11cc08c1 2020-07-23 stsp free(id_str);
808 11cc08c1 2020-07-23 stsp free(label_deriv);
809 11cc08c1 2020-07-23 stsp return err;
812 d219f183 2020-07-23 stsp /* forward declaration */
813 d219f183 2020-07-23 stsp static const struct got_error *
814 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
815 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
816 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
817 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
820 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
821 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
822 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
823 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
825 af57b12a 2020-07-23 stsp static const struct got_error *
826 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
827 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
828 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
829 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
830 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
832 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
833 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
834 af57b12a 2020-07-23 stsp struct stat sb;
835 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
836 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
837 11cc08c1 2020-07-23 stsp int have_local_change = 0;
838 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
840 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
841 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
843 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
844 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
845 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
846 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
847 af57b12a 2020-07-23 stsp ondisk_path);
850 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
852 526a746f 2020-07-23 stsp if (blob_orig) {
853 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
858 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
859 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
860 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
861 11cc08c1 2020-07-23 stsp have_local_change = 1;
863 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
864 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
865 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
866 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
867 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
869 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
870 11cc08c1 2020-07-23 stsp if (ancestor_target) {
871 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
872 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
874 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
875 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
876 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
877 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
880 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
881 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
882 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
883 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
886 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
889 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
890 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
891 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
892 af57b12a 2020-07-23 stsp strlen(deriv_target));
895 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
896 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
897 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
898 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
899 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
900 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
903 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
904 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
905 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
908 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
914 af57b12a 2020-07-23 stsp free(ancestor_target);
915 eec2f5a9 2021-06-03 stsp return err;
918 eec2f5a9 2021-06-03 stsp static const struct got_error *
919 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
921 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
922 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
923 eec2f5a9 2021-06-03 stsp ssize_t target_len;
927 eec2f5a9 2021-06-03 stsp *outfile = NULL;
929 eec2f5a9 2021-06-03 stsp f = got_opentemp();
930 eec2f5a9 2021-06-03 stsp if (f == NULL)
931 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
932 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
933 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
934 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
937 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
938 eec2f5a9 2021-06-03 stsp if (n != target_len) {
939 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
942 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
943 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
946 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
947 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
954 eec2f5a9 2021-06-03 stsp *outfile = f;
955 14c901f1 2019-08-08 stsp return err;
959 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
960 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
961 14c901f1 2019-08-08 stsp * acts as the second derived version.
963 14c901f1 2019-08-08 stsp static const struct got_error *
964 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
965 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
966 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
967 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
968 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
969 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
971 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
972 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
973 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
974 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
975 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
977 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
979 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
981 ed6b5030 2020-10-20 stsp return err;
983 67a66647 2021-05-31 stsp if (blob_orig) {
984 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
985 67a66647 2021-05-31 stsp parent) == -1) {
986 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
987 67a66647 2021-05-31 stsp base_path = NULL;
991 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
994 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
995 67a66647 2021-05-31 stsp blob_orig);
998 67a66647 2021-05-31 stsp free(base_path);
1001 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1002 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1003 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1005 db590691 2021-06-02 stsp f_orig = got_opentemp();
1006 db590691 2021-06-02 stsp if (f_orig == NULL) {
1007 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1008 db590691 2021-06-02 stsp goto done;
1012 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1013 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1014 14c901f1 2019-08-08 stsp base_path = NULL;
1015 14c901f1 2019-08-08 stsp goto done;
1018 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1020 14c901f1 2019-08-08 stsp goto done;
1021 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1022 14c901f1 2019-08-08 stsp blob_deriv);
1024 14c901f1 2019-08-08 stsp goto done;
1026 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1028 14c901f1 2019-08-08 stsp goto done;
1029 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1030 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1031 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1032 14c901f1 2019-08-08 stsp goto done;
1036 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1037 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1039 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1040 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1042 eec2f5a9 2021-06-03 stsp goto done;
1045 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1046 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1047 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1048 eec2f5a9 2021-06-03 stsp goto done;
1050 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1051 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1052 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1053 eec2f5a9 2021-06-03 stsp close(fd);
1054 eec2f5a9 2021-06-03 stsp goto done;
1058 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1059 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1060 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1062 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1063 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1064 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1065 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1066 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1067 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1068 14c901f1 2019-08-08 stsp free(base_path);
1069 67a66647 2021-05-31 stsp if (blob_orig_path) {
1070 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1071 67a66647 2021-05-31 stsp free(blob_orig_path);
1073 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1074 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1075 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1077 6353ad76 2019-02-08 stsp free(id_str);
1078 818c7501 2019-07-11 stsp free(label_deriv);
1079 ed6b5030 2020-10-20 stsp free(parent);
1080 4a1ddfc2 2019-01-12 stsp return err;
1083 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1084 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1085 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1086 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1088 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1089 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1091 65b05cec 2020-07-23 stsp *new_iep = NULL;
1093 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1095 054041d0 2020-06-24 stsp return err;
1097 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1098 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1100 054041d0 2020-06-24 stsp goto done;
1102 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1105 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1107 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1108 13d9040b 2019-03-27 stsp return err;
1111 1ebedb77 2019-10-19 stsp static mode_t
1112 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1114 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1116 1ebedb77 2019-10-19 stsp if (executable) {
1117 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1118 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1119 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1120 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1121 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1122 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1125 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1128 8ba819a3 2020-07-23 stsp /* forward declaration */
1129 13d9040b 2019-03-27 stsp static const struct got_error *
1130 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1131 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1132 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1133 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1134 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1135 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1138 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1139 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1141 8ba819a3 2020-07-23 stsp static const struct got_error *
1142 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1143 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1145 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1146 5a1fbc73 2020-07-23 stsp ssize_t elen;
1147 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1150 c6e8a826 2021-04-05 stsp *did_something = 0;
1153 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1154 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1155 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1156 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1157 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1158 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1160 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1161 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1162 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink())
1163 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1165 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1166 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1167 5a1fbc73 2020-07-23 stsp if (elen == -1)
1168 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1170 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1171 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1172 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1175 c6e8a826 2021-04-05 stsp *did_something = 1;
1176 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1177 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1178 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1179 5a1fbc73 2020-07-23 stsp return err;
1182 3c1ec782 2020-07-23 stsp static const struct got_error *
1183 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1184 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1186 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1187 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1188 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1190 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1192 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1193 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1194 3c1ec782 2020-07-23 stsp return NULL;
1198 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1199 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1200 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1201 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1202 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1204 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1205 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1206 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1208 ce031e9e 2020-10-20 stsp return err;
1209 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1210 ce031e9e 2020-10-20 stsp free(parent);
1211 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1213 ce031e9e 2020-10-20 stsp free(parent);
1214 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1215 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1216 3c1ec782 2020-07-23 stsp free(abspath);
1217 3c1ec782 2020-07-23 stsp return err;
1219 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1220 3c1ec782 2020-07-23 stsp free(abspath);
1222 3c1ec782 2020-07-23 stsp return err;
1224 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1226 3c1ec782 2020-07-23 stsp return err;
1229 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1230 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1231 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1232 3c1ec782 2020-07-23 stsp return NULL;
1235 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1236 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1237 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1238 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1239 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1240 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1242 3c1ec782 2020-07-23 stsp free(path_got);
1243 3c1ec782 2020-07-23 stsp return NULL;
1246 5a1fbc73 2020-07-23 stsp static const struct got_error *
1247 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1248 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1249 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1250 ace90326 2021-09-27 thomas int path_is_unversioned, int allow_bad_symlinks,
1251 ace90326 2021-09-27 thomas struct got_repository *repo,
1252 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1254 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1255 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1256 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1257 906c123b 2020-07-23 stsp char *path_got = NULL;
1258 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1259 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1261 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1264 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1265 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1266 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1267 8ba819a3 2020-07-23 stsp * in the blob object.
1270 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1271 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1272 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1273 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1274 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1275 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1276 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1277 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1278 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1279 3b9f0f87 2020-07-23 stsp progress_arg);
1281 8ba819a3 2020-07-23 stsp if (len > 0) {
1282 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1283 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1284 8ba819a3 2020-07-23 stsp len - hdrlen);
1285 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1286 8ba819a3 2020-07-23 stsp hdrlen = 0;
1288 8ba819a3 2020-07-23 stsp } while (len != 0);
1289 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1291 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1292 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1294 3c1ec782 2020-07-23 stsp return err;
1296 ace90326 2021-09-27 thomas if (*is_bad_symlink && !allow_bad_symlinks) {
1297 906c123b 2020-07-23 stsp /* install as a regular file */
1298 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1299 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1300 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1301 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1302 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1303 906c123b 2020-07-23 stsp goto done;
1306 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1307 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1308 c6e8a826 2021-04-05 stsp int symlink_replaced;
1309 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1310 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1311 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1312 c90c8ce3 2020-07-23 stsp goto done;
1314 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1315 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1317 f35fa46a 2020-07-23 stsp goto done;
1318 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1319 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1320 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1321 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1322 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1323 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1325 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1326 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1329 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1332 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1333 f4994adc 2020-10-20 stsp char *parent;
1334 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1336 f4994adc 2020-10-20 stsp goto done;
1337 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1338 f4994adc 2020-10-20 stsp free(parent);
1340 f35fa46a 2020-07-23 stsp goto done;
1342 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1343 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1345 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1346 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1347 f35fa46a 2020-07-23 stsp goto done;
1351 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1352 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1353 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1354 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1355 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1356 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1357 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1358 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1359 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1360 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1361 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1362 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1363 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1365 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1366 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1368 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1369 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1370 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1372 906c123b 2020-07-23 stsp free(path_got);
1373 8ba819a3 2020-07-23 stsp return err;
1376 8ba819a3 2020-07-23 stsp static const struct got_error *
1377 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1378 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1379 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1380 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1381 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1382 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1384 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1385 507dc3bb 2018-12-29 stsp int fd = -1;
1386 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1387 507dc3bb 2018-12-29 stsp int update = 0;
1388 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1390 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1391 06340621 2021-12-31 thomas O_CLOEXEC, GOT_DEFAULT_FILE_MODE);
1392 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1393 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1394 f5375317 2020-10-20 stsp char *parent;
1395 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1397 f5375317 2020-10-20 stsp return err;
1398 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1399 f5375317 2020-10-20 stsp free(parent);
1401 21908da4 2019-01-13 stsp return err;
1402 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1403 06340621 2021-12-31 thomas O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1404 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1405 21908da4 2019-01-13 stsp if (fd == -1)
1406 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1407 230a42bd 2019-05-11 jcs ondisk_path);
1408 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1409 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1410 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1411 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1412 3b9f0f87 2020-07-23 stsp goto done;
1414 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1415 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1416 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1417 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1418 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1419 507dc3bb 2018-12-29 stsp goto done;
1421 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1422 507dc3bb 2018-12-29 stsp ondisk_path);
1424 507dc3bb 2018-12-29 stsp goto done;
1425 507dc3bb 2018-12-29 stsp update = 1;
1428 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1431 3818e3c4 2020-11-01 naddy if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1432 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod",
1433 3818e3c4 2020-11-01 naddy update ? tmppath : ondisk_path);
1434 3818e3c4 2020-11-01 naddy goto done;
1437 bd6aa359 2020-07-23 stsp if (progress_cb) {
1438 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1439 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1441 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1442 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1445 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1446 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1448 bd6aa359 2020-07-23 stsp goto done;
1451 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1453 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1454 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1457 9d31a1d8 2018-03-11 stsp if (len > 0) {
1458 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1459 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1460 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1461 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1462 b87c6f83 2018-12-24 stsp goto done;
1463 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1464 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1465 b87c6f83 2018-12-24 stsp goto done;
1467 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1469 9d31a1d8 2018-03-11 stsp } while (len != 0);
1471 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1472 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1473 816dc654 2019-02-16 stsp goto done;
1476 507dc3bb 2018-12-29 stsp if (update) {
1477 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1478 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1479 f6d8c0ac 2020-11-09 stsp goto done;
1481 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1482 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1483 230a42bd 2019-05-11 jcs ondisk_path);
1484 68ed9ba5 2019-02-10 stsp goto done;
1486 63df146d 2020-11-09 stsp free(tmppath);
1487 63df146d 2020-11-09 stsp tmppath = NULL;
1491 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1492 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1493 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1494 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1495 507dc3bb 2018-12-29 stsp free(tmppath);
1496 6353ad76 2019-02-08 stsp return err;
1499 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1500 6353ad76 2019-02-08 stsp static const struct got_error *
1501 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1503 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1504 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1505 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1506 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1507 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1509 7154f6ce 2019-03-27 stsp int i = 0;
1510 9bdd68dd 2020-01-02 naddy char *line = NULL;
1511 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1512 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1514 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1515 9bdd68dd 2020-01-02 naddy linelen = getline(&line, &linesize, f);
1516 9bdd68dd 2020-01-02 naddy if (linelen == -1) {
1517 7154f6ce 2019-03-27 stsp if (feof(f))
1519 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1523 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1524 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1526 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1531 9bdd68dd 2020-01-02 naddy free(line);
1533 7154f6ce 2019-03-27 stsp return err;
1536 e2b1e152 2019-07-13 stsp static int
1537 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1539 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1540 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1543 1ebedb77 2019-10-19 stsp static int
1544 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1546 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1547 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1548 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1549 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1550 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1551 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1554 c363b2c1 2019-08-03 stsp static unsigned char
1555 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1557 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1558 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1559 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1560 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1561 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1562 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1563 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1565 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1569 a919d5c4 2020-07-23 stsp static const struct got_error *
1570 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1571 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1572 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1574 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1575 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1576 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1577 a919d5c4 2020-07-23 stsp ssize_t elen;
1578 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1579 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1580 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1582 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1584 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1586 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1588 a919d5c4 2020-07-23 stsp return err;
1589 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1591 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1592 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1594 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1596 a919d5c4 2020-07-23 stsp if (len > 0) {
1597 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1598 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1599 a919d5c4 2020-07-23 stsp len - hdrlen);
1600 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1601 a919d5c4 2020-07-23 stsp hdrlen = 0;
1603 a919d5c4 2020-07-23 stsp } while (len != 0);
1604 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1606 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1607 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1608 a919d5c4 2020-07-23 stsp if (elen == -1)
1609 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1611 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1612 a919d5c4 2020-07-23 stsp if (elen == -1)
1613 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1616 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1617 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1619 a919d5c4 2020-07-23 stsp return NULL;
1622 7154f6ce 2019-03-27 stsp static const struct got_error *
1623 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1624 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1625 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1627 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1628 6353ad76 2019-02-08 stsp struct got_object_id id;
1629 6353ad76 2019-02-08 stsp size_t hdrlen;
1630 1338848f 2019-12-13 stsp int fd = -1;
1631 6353ad76 2019-02-08 stsp FILE *f = NULL;
1632 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1633 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1634 6353ad76 2019-02-08 stsp size_t flen, blen;
1635 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1637 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1638 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1641 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1642 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1643 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1645 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1646 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1647 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1648 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1649 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1651 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1652 882ef1b9 2019-12-13 stsp goto done;
1654 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1655 3d35a492 2019-12-13 stsp goto done;
1658 06340621 2021-12-31 thomas fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1659 3dc1dc04 2021-09-27 thomas if (fd == -1 && errno != ENOENT &&
1660 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
1661 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1662 3dc1dc04 2021-09-27 thomas else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1663 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1664 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1665 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1666 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1667 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1668 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1670 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1671 3d35a492 2019-12-13 stsp goto done;
1673 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1674 1338848f 2019-12-13 stsp goto done;
1678 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1679 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1680 1338848f 2019-12-13 stsp goto done;
1683 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1684 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1685 1338848f 2019-12-13 stsp goto done;
1686 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1687 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1688 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1689 1338848f 2019-12-13 stsp goto done;
1692 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1693 f179e66d 2020-07-23 stsp goto done;
1695 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1696 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1697 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1698 1338848f 2019-12-13 stsp goto done;
1701 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1702 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1703 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1705 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1707 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1709 1338848f 2019-12-13 stsp goto done;
1711 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1712 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1713 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1714 a919d5c4 2020-07-23 stsp goto done;
1717 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1718 fc63f50d 2021-12-31 thomas fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1719 ab0d4361 2019-12-13 stsp if (fd == -1) {
1720 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1721 ab0d4361 2019-12-13 stsp goto done;
1725 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1726 6353ad76 2019-02-08 stsp if (f == NULL) {
1727 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1728 6353ad76 2019-02-08 stsp goto done;
1731 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1733 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1734 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1736 7154f6ce 2019-03-27 stsp goto done;
1737 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1738 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1739 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1740 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1741 7154f6ce 2019-03-27 stsp goto done;
1743 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1744 6353ad76 2019-02-08 stsp if (flen != 0)
1745 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1747 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1748 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1749 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1751 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1752 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1753 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1754 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1758 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1761 6353ad76 2019-02-08 stsp hdrlen = 0;
1764 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1765 7154f6ce 2019-03-27 stsp rewind(f);
1766 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1767 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1768 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1771 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1772 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1773 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1774 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1775 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1776 9d31a1d8 2018-03-11 stsp return err;
1780 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1781 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1783 e2b1e152 2019-07-13 stsp static const struct got_error *
1784 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1785 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1787 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1788 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1789 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1791 e2b1e152 2019-07-13 stsp return NULL;
1794 9d31a1d8 2018-03-11 stsp static const struct got_error *
1795 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1796 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1797 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1798 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1799 0584f854 2019-04-06 stsp void *progress_arg)
1801 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1802 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1803 6353ad76 2019-02-08 stsp char *ondisk_path;
1804 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1805 b8f41171 2019-02-10 stsp struct stat sb;
1807 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1808 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1811 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1812 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1813 a76c42e6 2019-08-03 stsp goto done;
1815 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1818 abb4604f 2019-07-27 stsp goto done;
1819 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1820 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1822 e6f4ba31 2021-09-24 thomas if (stat(ondisk_path, &sb) == -1) {
1823 e6f4ba31 2021-09-24 thomas if (errno != ENOENT) {
1824 e6f4ba31 2021-09-24 thomas err = got_error_from_errno2("stat",
1825 e6f4ba31 2021-09-24 thomas ondisk_path);
1826 e6f4ba31 2021-09-24 thomas goto done;
1828 e6f4ba31 2021-09-24 thomas sb.st_mode = GOT_DEFAULT_FILE_MODE;
1829 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1830 e6f4ba31 2021-09-24 thomas } else {
1831 e6f4ba31 2021-09-24 thomas if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1832 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1834 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_OBSTRUCTED;
1838 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1840 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1841 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1842 b8f41171 2019-02-10 stsp goto done;
1844 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1846 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1847 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1849 5036ab18 2020-04-18 stsp goto done;
1852 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1853 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1854 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1856 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1857 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1858 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1859 c6e8a826 2021-04-05 stsp * updating contents of this file.
1861 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1862 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1863 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1864 c6e8a826 2021-04-05 stsp /* Same commit. */
1865 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1866 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1868 e2b1e152 2019-07-13 stsp goto done;
1869 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1871 6353ad76 2019-02-08 stsp goto done;
1873 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1874 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1875 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1876 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1877 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1878 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1880 0f58026f 2021-04-05 stsp goto done;
1881 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1883 b8f41171 2019-02-10 stsp goto done;
1887 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1889 6353ad76 2019-02-08 stsp goto done;
1891 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1892 234035bc 2019-06-01 stsp int update_timestamps;
1893 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1894 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1895 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1896 234035bc 2019-06-01 stsp struct got_object_id id2;
1897 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1898 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1900 f69721c3 2019-10-21 stsp goto done;
1902 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1903 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1904 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1905 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1906 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1907 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1908 f69721c3 2019-10-21 stsp goto done;
1910 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1911 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1912 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1913 234035bc 2019-06-01 stsp goto done;
1916 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1917 36bf999c 2020-07-23 stsp char *link_target;
1918 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1920 36bf999c 2020-07-23 stsp goto done;
1921 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1922 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1923 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1924 36bf999c 2020-07-23 stsp free(link_target);
1926 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1927 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1928 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1929 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1931 f69721c3 2019-10-21 stsp free(label_orig);
1932 234035bc 2019-06-01 stsp if (blob2)
1933 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1935 909d120e 2019-09-22 stsp goto done;
1937 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1938 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1939 234035bc 2019-06-01 stsp * unmodified files again.
1941 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1942 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1943 234035bc 2019-06-01 stsp update_timestamps);
1944 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1945 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1946 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1947 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1948 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1950 1ee397ad 2019-07-12 stsp goto done;
1951 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1952 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1954 13d9040b 2019-03-27 stsp goto done;
1956 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1957 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1958 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1959 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1960 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1961 ace90326 2021-09-27 thomas status == GOT_STATUS_UNVERSIONED, 0,
1962 ace90326 2021-09-27 thomas repo, progress_cb, progress_arg);
1964 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1965 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
1966 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
1967 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1968 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1971 13d9040b 2019-03-27 stsp goto done;
1974 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
1975 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
1976 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
1978 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
1979 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
1980 054041d0 2020-06-24 stsp &blob->id);
1983 13d9040b 2019-03-27 stsp goto done;
1985 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
1986 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
1987 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
1990 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1992 6353ad76 2019-02-08 stsp free(ondisk_path);
1993 8da9e5f4 2019-01-12 stsp return err;
1996 90285c3b 2019-01-08 stsp static const struct got_error *
1997 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1999 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2000 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2002 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2003 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2005 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2006 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2007 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2009 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2010 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2012 1c4cdd89 2021-06-20 stsp goto done;
2013 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2014 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2015 fddefe3b 2020-10-20 stsp free(ondisk_path);
2016 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2017 1c4cdd89 2021-06-20 stsp parent = NULL;
2018 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2019 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2020 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2021 fddefe3b 2020-10-20 stsp ondisk_path);
2024 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2030 90285c3b 2019-01-08 stsp free(ondisk_path);
2031 1c4cdd89 2021-06-20 stsp free(parent);
2032 90285c3b 2019-01-08 stsp return err;
2035 708d8e67 2019-03-27 stsp static const struct got_error *
2036 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2037 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2038 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2040 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2041 708d8e67 2019-03-27 stsp unsigned char status;
2042 708d8e67 2019-03-27 stsp struct stat sb;
2043 708d8e67 2019-03-27 stsp char *ondisk_path;
2045 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2046 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2048 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2050 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2052 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2054 5a58a424 2020-06-23 stsp goto done;
2056 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2057 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2058 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2059 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2060 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2061 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2062 993e2a1b 2020-07-23 stsp goto done;
2064 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2065 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2066 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2067 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2069 993e2a1b 2020-07-23 stsp goto done;
2070 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2071 993e2a1b 2020-07-23 stsp ie->path);
2072 993e2a1b 2020-07-23 stsp goto done;
2075 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2076 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2077 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2079 5a58a424 2020-06-23 stsp goto done;
2081 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2082 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2084 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2085 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2087 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2089 5a58a424 2020-06-23 stsp goto done;
2090 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2091 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2093 5a58a424 2020-06-23 stsp goto done;
2095 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2098 5a58a424 2020-06-23 stsp free(ondisk_path);
2099 fc6346c4 2019-03-27 stsp return err;
2102 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2103 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2104 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2105 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2106 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2107 8da9e5f4 2019-01-12 stsp void *progress_arg;
2108 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2109 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2112 512f0d0e 2019-01-02 stsp static const struct got_error *
2113 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2114 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2116 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2118 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2119 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2121 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2122 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2125 8da9e5f4 2019-01-12 stsp static const struct got_error *
2126 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2128 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2130 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2131 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2133 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2134 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2137 9d31a1d8 2018-03-11 stsp static const struct got_error *
2138 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2140 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2141 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2142 8da9e5f4 2019-01-12 stsp char *path;
2144 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2145 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2147 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2148 63c5ca5d 2019-08-24 stsp return NULL;
2150 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2151 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2153 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2155 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2156 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2158 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2159 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2161 8da9e5f4 2019-01-12 stsp free(path);
2162 0cd1c46a 2019-03-11 stsp return err;
2165 b2118c49 2020-07-28 stsp const struct got_error *
2166 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2168 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2170 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2171 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2172 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2173 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2176 b2118c49 2020-07-28 stsp return NULL;
2179 818c7501 2019-07-11 stsp static const struct got_error *
2180 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2182 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2183 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2185 517bab73 2019-03-11 stsp *refname = NULL;
2187 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2189 b2118c49 2020-07-28 stsp return err;
2191 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2192 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2193 0647c563 2019-03-11 stsp *refname = NULL;
2195 517bab73 2019-03-11 stsp free(uuidstr);
2196 517bab73 2019-03-11 stsp return err;
2199 818c7501 2019-07-11 stsp const struct got_error *
2200 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2202 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2205 818c7501 2019-07-11 stsp static const struct got_error *
2206 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2208 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2209 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2212 818c7501 2019-07-11 stsp static const struct got_error *
2213 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2215 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2218 818c7501 2019-07-11 stsp static const struct got_error *
2219 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2221 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2222 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2225 818c7501 2019-07-11 stsp static const struct got_error *
2226 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2228 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2229 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2232 0ebf8283 2019-07-24 stsp static const struct got_error *
2233 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2235 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2236 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2239 0ebf8283 2019-07-24 stsp static const struct got_error *
2240 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2242 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2243 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2246 0ebf8283 2019-07-24 stsp static const struct got_error *
2247 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2249 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2250 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2253 0ebf8283 2019-07-24 stsp static const struct got_error *
2254 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2256 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2257 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2260 0ebf8283 2019-07-24 stsp const struct got_error *
2261 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2262 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2264 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2265 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2266 0ebf8283 2019-07-24 stsp *path = NULL;
2267 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2269 0ebf8283 2019-07-24 stsp return NULL;
2272 10604dce 2021-09-24 thomas static const struct got_error *
2273 10604dce 2021-09-24 thomas get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2275 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2276 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2279 10604dce 2021-09-24 thomas static const struct got_error *
2280 10604dce 2021-09-24 thomas get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2282 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2283 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2287 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2288 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2290 517bab73 2019-03-11 stsp static const struct got_error *
2291 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2293 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2294 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2295 517bab73 2019-03-11 stsp char *refname;
2297 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2299 517bab73 2019-03-11 stsp return err;
2301 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2303 0cd1c46a 2019-03-11 stsp goto done;
2305 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2307 0cd1c46a 2019-03-11 stsp free(refname);
2309 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2310 3e3a69f1 2019-07-25 stsp return err;
2313 3e3a69f1 2019-07-25 stsp static const struct got_error *
2314 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2316 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2318 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2319 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2320 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2321 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2323 9d31a1d8 2018-03-11 stsp return err;
2327 ebf99748 2019-05-09 stsp static const struct got_error *
2328 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2329 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2331 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2332 ebf99748 2019-05-09 stsp FILE *index = NULL;
2334 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2335 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2336 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2337 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2339 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2341 ebf99748 2019-05-09 stsp goto done;
2343 c56c5d8a 2021-12-31 thomas index = fopen(*fileindex_path, "rbe");
2344 ebf99748 2019-05-09 stsp if (index == NULL) {
2345 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2346 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2348 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2349 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2350 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2353 ebf99748 2019-05-09 stsp if (err) {
2354 ebf99748 2019-05-09 stsp free(*fileindex_path);
2355 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2356 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2357 ebf99748 2019-05-09 stsp *fileindex = NULL;
2359 ebf99748 2019-05-09 stsp return err;
2362 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2363 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2364 c932eeeb 2019-05-22 stsp const char *path;
2365 c932eeeb 2019-05-22 stsp size_t path_len;
2366 c932eeeb 2019-05-22 stsp const char *entry_name;
2367 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2368 a484d721 2019-06-10 stsp void *progress_arg;
2371 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2372 c932eeeb 2019-05-22 stsp static const struct got_error *
2373 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2375 1ee397ad 2019-07-12 stsp const struct got_error *err;
2376 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2378 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2379 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2380 c932eeeb 2019-05-22 stsp return NULL;
2381 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2382 102ff934 2019-06-11 stsp return NULL;
2384 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2385 a769b60b 2021-06-27 stsp return NULL;
2387 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2388 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2389 c932eeeb 2019-05-22 stsp return NULL;
2391 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2392 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2393 edd02c5e 2019-07-11 stsp ie->path);
2395 1ee397ad 2019-07-12 stsp return err;
2397 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2398 c932eeeb 2019-05-22 stsp return NULL;
2401 a615e0e7 2020-12-16 stsp static const struct got_error *
2402 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2403 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2404 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2406 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2408 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2409 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2410 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2411 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2412 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2413 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2415 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2416 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2419 9c6338c4 2019-06-02 stsp static const struct got_error *
2420 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2422 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2423 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2424 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2425 867630bb 2020-01-17 stsp struct timespec timeout;
2427 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2428 9c6338c4 2019-06-02 stsp fileindex_path);
2430 9c6338c4 2019-06-02 stsp goto done;
2432 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2434 9c6338c4 2019-06-02 stsp goto done;
2436 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2437 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2438 9c6338c4 2019-06-02 stsp fileindex_path);
2439 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2443 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2444 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2445 867630bb 2020-01-17 stsp * was recorded in the file index.
2447 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2448 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2449 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2451 9c6338c4 2019-06-02 stsp if (new_index)
2452 9c6338c4 2019-06-02 stsp fclose(new_index);
2453 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2454 9c6338c4 2019-06-02 stsp return err;
2457 6ced4176 2019-07-12 stsp static const struct got_error *
2458 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2459 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2460 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2462 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2463 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2464 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2465 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2467 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2468 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2469 6ced4176 2019-07-12 stsp *tree_id = NULL;
2471 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2472 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2473 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2474 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2475 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2476 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2477 6ced4176 2019-07-12 stsp goto done;
2479 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2480 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2482 6ced4176 2019-07-12 stsp goto done;
2483 6ced4176 2019-07-12 stsp return NULL;
2486 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2488 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2489 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2490 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2491 6ced4176 2019-07-12 stsp goto done;
2494 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2495 6ced4176 2019-07-12 stsp in_repo_path);
2497 6ced4176 2019-07-12 stsp goto done;
2499 6ced4176 2019-07-12 stsp free(in_repo_path);
2500 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2502 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2504 6ced4176 2019-07-12 stsp goto done;
2506 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2507 6ced4176 2019-07-12 stsp /* Check out a single file. */
2508 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2509 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2510 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2511 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2512 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2513 6ced4176 2019-07-12 stsp goto done;
2515 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2516 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2517 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2518 6ced4176 2019-07-12 stsp goto done;
2521 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2522 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2524 6ced4176 2019-07-12 stsp return err;
2525 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2526 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2527 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2528 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2529 6ced4176 2019-07-12 stsp goto done;
2532 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2533 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2535 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2536 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2537 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2538 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2539 6ced4176 2019-07-12 stsp goto done;
2541 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2542 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2543 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2544 6ced4176 2019-07-12 stsp goto done;
2549 6ced4176 2019-07-12 stsp free(in_repo_path);
2550 6ced4176 2019-07-12 stsp if (err) {
2551 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2552 6ced4176 2019-07-12 stsp free(*tree_relpath);
2553 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2554 6ced4176 2019-07-12 stsp free(*tree_id);
2555 6ced4176 2019-07-12 stsp *tree_id = NULL;
2557 07ed472d 2019-07-12 stsp return err;
2560 07ed472d 2019-07-12 stsp static const struct got_error *
2561 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2562 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2563 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2564 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2566 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2567 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2568 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2569 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2570 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2572 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2573 7f47418f 2019-12-20 stsp if (err) {
2574 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2575 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2576 7f47418f 2019-12-20 stsp goto done;
2577 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2578 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2580 7f47418f 2019-12-20 stsp return err;
2583 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2584 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2586 07ed472d 2019-07-12 stsp goto done;
2588 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2590 07ed472d 2019-07-12 stsp goto done;
2592 07ed472d 2019-07-12 stsp if (entry_name &&
2593 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2594 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2595 07ed472d 2019-07-12 stsp goto done;
2598 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2599 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2600 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2601 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2602 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2603 07ed472d 2019-07-12 stsp arg.repo = repo;
2604 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2605 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2606 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2607 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2608 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2609 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2612 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2613 07ed472d 2019-07-12 stsp if (commit)
2614 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2615 6ced4176 2019-07-12 stsp return err;
2618 9d31a1d8 2018-03-11 stsp const struct got_error *
2619 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2620 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2621 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2622 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2624 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2625 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2626 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2627 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2628 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2629 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2630 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2631 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2632 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2633 f2ea84fa 2019-07-27 stsp int entry_type;
2634 f2ea84fa 2019-07-27 stsp char *relpath;
2635 f2ea84fa 2019-07-27 stsp char *entry_name;
2636 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2637 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2639 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2641 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2643 9d31a1d8 2018-03-11 stsp return err;
2645 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2646 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2647 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2648 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2649 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2650 f2ea84fa 2019-07-27 stsp goto done;
2653 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2654 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2655 f2ea84fa 2019-07-27 stsp if (err) {
2656 f2ea84fa 2019-07-27 stsp free(tpd);
2657 6ced4176 2019-07-12 stsp goto done;
2660 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2661 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2662 f2ea84fa 2019-07-27 stsp if (err) {
2663 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2664 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2665 f2ea84fa 2019-07-27 stsp free(tpd);
2666 f2ea84fa 2019-07-27 stsp goto done;
2669 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2671 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2675 51514078 2018-12-25 stsp * Read the file index.
2676 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2677 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2679 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2681 c4cdcb68 2019-04-03 stsp goto done;
2683 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2684 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2685 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2687 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2688 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2689 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2693 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2694 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2695 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2696 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2697 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2698 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2699 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2700 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2704 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2706 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2707 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2708 af12c6b9 2019-06-04 stsp err = sync_err;
2710 9c6338c4 2019-06-02 stsp free(fileindex_path);
2712 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2713 9d31a1d8 2018-03-11 stsp if (commit)
2714 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2715 5ade8233 2019-07-12 stsp if (fileindex)
2716 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2717 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2718 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2719 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2720 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2721 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2722 f2ea84fa 2019-07-27 stsp free(tpd);
2724 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2725 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2726 9d31a1d8 2018-03-11 stsp err = unlockerr;
2727 f8d1f275 2019-02-04 stsp return err;
2730 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2731 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2732 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2733 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2734 234035bc 2019-06-01 stsp void *progress_arg;
2735 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2736 234035bc 2019-06-01 stsp void *cancel_arg;
2737 f69721c3 2019-10-21 stsp const char *label_orig;
2738 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2739 ace90326 2021-09-27 thomas int allow_bad_symlinks;
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;
2755 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2756 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2758 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2759 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2760 d6c87207 2019-08-02 stsp strlen(path2));
2761 1ee397ad 2019-07-12 stsp if (ie == NULL)
2762 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2763 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2765 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2766 234035bc 2019-06-01 stsp path2) == -1)
2767 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2769 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2772 234035bc 2019-06-01 stsp goto done;
2774 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2775 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2776 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2777 234035bc 2019-06-01 stsp goto done;
2779 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2780 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2781 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2782 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2783 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2784 234035bc 2019-06-01 stsp goto done;
2787 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2788 36bf999c 2020-07-23 stsp char *link_target2;
2789 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2791 36bf999c 2020-07-23 stsp goto done;
2792 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2793 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2794 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2795 36bf999c 2020-07-23 stsp free(link_target2);
2799 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2800 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2801 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2802 1af628f4 2021-06-03 stsp goto done;
2804 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2805 1af628f4 2021-06-03 stsp f_orig, blob1);
2807 1af628f4 2021-06-03 stsp goto done;
2809 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2810 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2811 1af628f4 2021-06-03 stsp goto done;
2812 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2813 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2815 1af628f4 2021-06-03 stsp goto done;
2817 48b4f239 2021-12-31 thomas fd = open(ondisk_path,
2818 48b4f239 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2819 1af628f4 2021-06-03 stsp if (fd == -1) {
2820 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2821 1af628f4 2021-06-03 stsp ondisk_path);
2822 1af628f4 2021-06-03 stsp goto done;
2824 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2825 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2826 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2827 1af628f4 2021-06-03 stsp ondisk_path);
2828 1af628f4 2021-06-03 stsp close(fd);
2829 1af628f4 2021-06-03 stsp goto done;
2831 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2833 1af628f4 2021-06-03 stsp goto done;
2834 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2835 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2836 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2837 1af628f4 2021-06-03 stsp goto done;
2839 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2840 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2841 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2842 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2843 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2845 234035bc 2019-06-01 stsp } else if (blob1) {
2846 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2847 d6c87207 2019-08-02 stsp strlen(path1));
2848 1ee397ad 2019-07-12 stsp if (ie == NULL)
2849 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2850 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2852 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2853 2b92fad7 2019-06-02 stsp path1) == -1)
2854 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2856 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2859 2b92fad7 2019-06-02 stsp goto done;
2861 2b92fad7 2019-06-02 stsp switch (status) {
2862 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2863 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2864 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2866 1ee397ad 2019-07-12 stsp goto done;
2867 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2869 2b92fad7 2019-06-02 stsp goto done;
2871 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2873 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2874 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2875 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2876 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2878 1ee397ad 2019-07-12 stsp goto done;
2880 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2882 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2883 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2884 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2885 e8f02263 2022-01-23 thomas off_t blob1_size;
2887 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2888 0a22ca1a 2020-09-23 stsp * exists in the repository.
2890 e8f02263 2022-01-23 thomas err = got_object_blob_file_create(&id, &blob1_f,
2891 e8f02263 2022-01-23 thomas &blob1_size, path1);
2893 0a22ca1a 2020-09-23 stsp goto done;
2894 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2895 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2896 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2898 0a22ca1a 2020-09-23 stsp goto done;
2899 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2902 0a22ca1a 2020-09-23 stsp goto done;
2904 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2907 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2908 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2910 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2911 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2914 0a22ca1a 2020-09-23 stsp goto done;
2917 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2918 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2919 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2920 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2922 1ee397ad 2019-07-12 stsp goto done;
2924 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2925 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2927 1ee397ad 2019-07-12 stsp goto done;
2932 234035bc 2019-06-01 stsp } else if (blob2) {
2933 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2934 234035bc 2019-06-01 stsp path2) == -1)
2935 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2936 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2937 d6c87207 2019-08-02 stsp strlen(path2));
2939 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2940 7f91a133 2019-12-13 stsp -1, NULL, repo);
2942 234035bc 2019-06-01 stsp goto done;
2943 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2944 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2945 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2946 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2947 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2948 1ee397ad 2019-07-12 stsp status, path2);
2949 234035bc 2019-06-01 stsp goto done;
2951 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2952 36bf999c 2020-07-23 stsp char *link_target2;
2953 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2956 36bf999c 2020-07-23 stsp goto done;
2957 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2958 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2959 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2960 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2961 36bf999c 2020-07-23 stsp free(link_target2);
2962 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2963 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2964 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2965 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2966 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2967 526a746f 2020-07-23 stsp a->progress_arg);
2969 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2970 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2973 dfe9fba0 2020-07-23 stsp goto done;
2974 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2975 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2976 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
2977 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2979 234035bc 2019-06-01 stsp goto done;
2982 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2983 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2984 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2985 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2986 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2987 ace90326 2021-09-27 thomas 0, 1, a->allow_bad_symlinks, repo,
2988 ace90326 2021-09-27 thomas a->progress_cb, a->progress_arg);
2990 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2991 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2992 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2995 234035bc 2019-06-01 stsp goto done;
2996 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2998 234035bc 2019-06-01 stsp goto done;
2999 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3000 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3001 3969253a 2020-03-07 stsp if (err) {
3002 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3003 3969253a 2020-03-07 stsp goto done;
3005 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3006 2b92fad7 2019-06-02 stsp if (err) {
3007 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3008 2b92fad7 2019-06-02 stsp goto done;
3010 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3011 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3012 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3017 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3018 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3019 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3020 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3021 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3022 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3023 1af628f4 2021-06-03 stsp free(id_str);
3024 54d5be07 2021-06-03 stsp free(label_deriv2);
3025 234035bc 2019-06-01 stsp free(ondisk_path);
3026 234035bc 2019-06-01 stsp return err;
3029 69de9dd4 2021-09-03 stsp static const struct got_error *
3030 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3032 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3034 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3035 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3036 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3037 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3038 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3040 69de9dd4 2021-09-03 stsp return NULL;
3043 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3044 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3045 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3046 234035bc 2019-06-01 stsp struct got_repository *repo;
3049 234035bc 2019-06-01 stsp static const struct got_error *
3050 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3051 69de9dd4 2021-09-03 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3052 69de9dd4 2021-09-03 stsp struct got_object_id *id2, const char *path1, const char *path2,
3053 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3055 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3056 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3057 234035bc 2019-06-01 stsp unsigned char status;
3058 234035bc 2019-06-01 stsp struct stat sb;
3059 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3060 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3061 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3062 234035bc 2019-06-01 stsp char *ondisk_path;
3064 69de9dd4 2021-09-03 stsp if (id == NULL)
3065 69de9dd4 2021-09-03 stsp return NULL;
3067 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3068 69de9dd4 2021-09-03 stsp if (ie == NULL)
3069 69de9dd4 2021-09-03 stsp return NULL;
3071 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3073 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3075 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3076 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3077 5546d466 2021-09-02 stsp free(ondisk_path);
3079 234035bc 2019-06-01 stsp return err;
3080 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3081 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3083 234035bc 2019-06-01 stsp return NULL;
3086 818c7501 2019-07-11 stsp static const struct got_error *
3087 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3088 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3089 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3090 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3091 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3093 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3094 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3095 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3096 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3097 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3098 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3100 03415a1a 2019-06-02 stsp if (commit_id1) {
3101 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3102 03415a1a 2019-06-02 stsp worktree->path_prefix);
3103 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3104 03415a1a 2019-06-02 stsp goto done;
3106 69d57f3d 2020-07-31 stsp if (tree_id1) {
3107 69d57f3d 2020-07-31 stsp char *id_str;
3109 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3111 03415a1a 2019-06-02 stsp goto done;
3113 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3115 f69721c3 2019-10-21 stsp goto done;
3117 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3118 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3119 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3120 f69721c3 2019-10-21 stsp free(id_str);
3121 f69721c3 2019-10-21 stsp goto done;
3123 f69721c3 2019-10-21 stsp free(id_str);
3126 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3127 234035bc 2019-06-01 stsp worktree->path_prefix);
3129 234035bc 2019-06-01 stsp goto done;
3131 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3133 234035bc 2019-06-01 stsp goto done;
3135 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3136 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3137 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3138 69de9dd4 2021-09-03 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3139 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3141 69de9dd4 2021-09-03 stsp goto done;
3143 234035bc 2019-06-01 stsp arg.worktree = worktree;
3144 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3145 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3146 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3147 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3148 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3149 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3150 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3151 ace90326 2021-09-27 thomas arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3152 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3153 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3154 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3155 af12c6b9 2019-06-04 stsp err = sync_err;
3157 234035bc 2019-06-01 stsp if (tree1)
3158 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3159 234035bc 2019-06-01 stsp if (tree2)
3160 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3161 f69721c3 2019-10-21 stsp free(label_orig);
3162 818c7501 2019-07-11 stsp return err;
3165 818c7501 2019-07-11 stsp const struct got_error *
3166 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3167 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3168 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3169 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3171 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3172 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3173 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3175 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3177 818c7501 2019-07-11 stsp return err;
3179 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3181 818c7501 2019-07-11 stsp goto done;
3183 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3184 69de9dd4 2021-09-03 stsp worktree);
3186 818c7501 2019-07-11 stsp goto done;
3188 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3189 10604dce 2021-09-24 thomas commit_id2, repo, progress_cb, progress_arg,
3190 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
3192 818c7501 2019-07-11 stsp if (fileindex)
3193 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3194 818c7501 2019-07-11 stsp free(fileindex_path);
3195 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3196 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3197 234035bc 2019-06-01 stsp err = unlockerr;
3198 234035bc 2019-06-01 stsp return err;
3201 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3202 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3203 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3204 927df6b7 2019-02-10 stsp const char *status_path;
3205 927df6b7 2019-02-10 stsp size_t status_path_len;
3206 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3207 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3208 f8d1f275 2019-02-04 stsp void *status_arg;
3209 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3210 f8d1f275 2019-02-04 stsp void *cancel_arg;
3211 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3212 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3213 f2a9dc41 2019-12-13 tracey int report_unchanged;
3214 3143d852 2020-06-25 stsp int no_ignores;
3217 f8d1f275 2019-02-04 stsp static const struct got_error *
3218 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3219 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3220 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3221 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3223 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3224 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3225 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3226 927df6b7 2019-02-10 stsp struct stat sb;
3227 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3228 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3229 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3231 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3233 98eaaa12 2019-08-03 stsp return err;
3235 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3236 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3237 98eaaa12 2019-08-03 stsp return NULL;
3239 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3240 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3241 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3243 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3244 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3245 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3247 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3248 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3249 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3250 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3251 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3254 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3255 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3258 927df6b7 2019-02-10 stsp static const struct got_error *
3259 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3260 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3262 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3263 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3264 f8d1f275 2019-02-04 stsp char *abspath;
3266 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3267 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3269 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3270 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3271 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3272 927df6b7 2019-02-10 stsp return NULL;
3274 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3275 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3276 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3277 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3279 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3280 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3281 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3284 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3285 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3286 f8d1f275 2019-02-04 stsp free(abspath);
3287 9d31a1d8 2018-03-11 stsp return err;
3290 f8d1f275 2019-02-04 stsp static const struct got_error *
3291 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3293 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3294 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3295 2ec1f75b 2019-03-26 stsp unsigned char status;
3297 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3298 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3300 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3301 927df6b7 2019-02-10 stsp return NULL;
3303 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3304 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3305 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3306 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3308 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3309 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3310 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3314 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3316 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3318 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3319 6841da00 2019-08-08 stsp free((char *)pe->path);
3320 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3324 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3326 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3328 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3329 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3330 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3331 6841da00 2019-08-08 stsp free((char *)pe->path);
3333 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3336 6841da00 2019-08-08 stsp static const struct got_error *
3337 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3339 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3340 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3341 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3342 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3343 6841da00 2019-08-08 stsp size_t linesize = 0;
3344 6841da00 2019-08-08 stsp ssize_t linelen;
3346 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3347 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3348 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3349 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3351 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3352 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3353 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3355 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3356 bd8de430 2019-10-04 stsp if (line[0] == '#')
3359 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3360 bd8de430 2019-10-04 stsp if (line[0] == '!')
3363 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3364 6841da00 2019-08-08 stsp line) == -1) {
3365 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3366 6841da00 2019-08-08 stsp goto done;
3368 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3370 6841da00 2019-08-08 stsp goto done;
3372 6841da00 2019-08-08 stsp if (ferror(f)) {
3373 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3374 6841da00 2019-08-08 stsp goto done;
3377 6841da00 2019-08-08 stsp dirpath = strdup(path);
3378 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3379 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3380 6841da00 2019-08-08 stsp goto done;
3382 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3384 6841da00 2019-08-08 stsp free(line);
3385 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3386 6841da00 2019-08-08 stsp free(dirpath);
3387 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3389 6841da00 2019-08-08 stsp return err;
3393 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3395 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3397 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3398 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3399 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3400 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3402 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3403 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3405 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3407 bd8de430 2019-10-04 stsp pattern += 3;
3409 bd8de430 2019-10-04 stsp while (*p) {
3410 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3411 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3412 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3413 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3415 bd8de430 2019-10-04 stsp while (*p == '/')
3425 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3426 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3427 6841da00 2019-08-08 stsp * ignores backwards.
3429 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3430 6841da00 2019-08-08 stsp while (pe) {
3431 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3432 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3433 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3434 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3435 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3436 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3437 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3438 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3439 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3444 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3450 6841da00 2019-08-08 stsp static const struct got_error *
3451 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3452 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3454 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3455 6841da00 2019-08-08 stsp char *ignorespath;
3456 886cec17 2019-12-15 stsp int fd = -1;
3457 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3459 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3460 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3461 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3463 886cec17 2019-12-15 stsp if (dirfd != -1) {
3464 fc63f50d 2021-12-31 thomas fd = openat(dirfd, ignores_filename,
3465 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3466 886cec17 2019-12-15 stsp if (fd == -1) {
3467 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3468 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3469 886cec17 2019-12-15 stsp ignorespath);
3471 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3472 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3473 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3474 886cec17 2019-12-15 stsp ignorespath);
3477 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3481 c56c5d8a 2021-12-31 thomas ignoresfile = fopen(ignorespath, "re");
3482 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3483 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3484 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3485 886cec17 2019-12-15 stsp ignorespath);
3487 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3490 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3491 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3492 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3493 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3494 6841da00 2019-08-08 stsp free(ignorespath);
3495 6841da00 2019-08-08 stsp return err;
3498 f8d1f275 2019-02-04 stsp static const struct got_error *
3499 6092c299 2021-10-04 thomas status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3500 6092c299 2021-10-04 thomas int dirfd)
3502 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3503 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3504 f8d1f275 2019-02-04 stsp char *path = NULL;
3506 6092c299 2021-10-04 thomas if (ignore != NULL)
3507 6092c299 2021-10-04 thomas *ignore = 0;
3509 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3510 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3512 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3513 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3514 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3516 f8d1f275 2019-02-04 stsp path = de->d_name;
3519 6092c299 2021-10-04 thomas if (de->d_type == DT_DIR) {
3520 6092c299 2021-10-04 thomas if (!a->no_ignores && ignore != NULL &&
3521 6092c299 2021-10-04 thomas match_ignores(a->ignores, path))
3522 6092c299 2021-10-04 thomas *ignore = 1;
3523 6092c299 2021-10-04 thomas } else if (!match_ignores(a->ignores, path) &&
3524 6092c299 2021-10-04 thomas got_path_is_child(path, a->status_path, a->status_path_len))
3525 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3526 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3527 f8d1f275 2019-02-04 stsp if (parent_path[0])
3528 f8d1f275 2019-02-04 stsp free(path);
3529 b72f483a 2019-02-05 stsp return err;
3532 347d1d3e 2019-07-12 stsp static const struct got_error *
3533 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3535 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3536 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3538 3143d852 2020-06-25 stsp if (a->no_ignores)
3539 3143d852 2020-06-25 stsp return NULL;
3541 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3542 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3544 3143d852 2020-06-25 stsp return err;
3546 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3547 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3549 3143d852 2020-06-25 stsp return err;
3552 3143d852 2020-06-25 stsp static const struct got_error *
3553 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3554 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3555 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3556 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3558 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3559 abb4604f 2019-07-27 stsp struct stat sb;
3561 0e33f8e0 2021-09-01 stsp if (!no_ignores && match_ignores(ignores, path))
3562 ff56836b 2021-07-08 stsp return NULL;
3564 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3566 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3567 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3569 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3570 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3571 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3572 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3573 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3576 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3577 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3578 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3580 abb4604f 2019-07-27 stsp return NULL;
3583 3143d852 2020-06-25 stsp static const struct got_error *
3584 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3585 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3587 3143d852 2020-06-25 stsp const struct got_error *err;
3588 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3590 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3591 3143d852 2020-06-25 stsp ".cvsignore");
3593 3143d852 2020-06-25 stsp return err;
3595 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3596 3143d852 2020-06-25 stsp ".gitignore");
3598 3143d852 2020-06-25 stsp return err;
3600 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3601 3143d852 2020-06-25 stsp if (err) {
3602 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3603 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3604 3143d852 2020-06-25 stsp return err;
3606 3143d852 2020-06-25 stsp for (;;) {
3607 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3608 3143d852 2020-06-25 stsp ".cvsignore");
3611 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3612 3143d852 2020-06-25 stsp ".gitignore");
3615 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3616 3143d852 2020-06-25 stsp if (err) {
3617 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3618 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3621 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3623 b737c85a 2020-06-26 stsp free(parent_path);
3624 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3625 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3628 b737c85a 2020-06-26 stsp free(parent_path);
3629 b737c85a 2020-06-26 stsp free(next_parent_path);
3630 3143d852 2020-06-25 stsp return err;
3633 abb4604f 2019-07-27 stsp static const struct got_error *
3634 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3635 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3636 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3637 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3638 f2a9dc41 2019-12-13 tracey int report_unchanged)
3640 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3641 6fc93f37 2019-12-13 stsp int fd = -1;
3642 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3643 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3644 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3645 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3647 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3649 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3650 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3651 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3653 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3654 6fc93f37 2019-12-13 stsp if (fd == -1) {
3655 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3656 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
3657 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3659 ff56836b 2021-07-08 stsp if (!no_ignores) {
3660 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3661 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3663 ff56836b 2021-07-08 stsp goto done;
3665 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3666 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3667 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3670 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3671 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3672 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3673 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3674 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3675 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3676 abb4604f 2019-07-27 stsp arg.status_path = path;
3677 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3678 abb4604f 2019-07-27 stsp arg.repo = repo;
3679 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3680 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3681 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3682 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3683 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3684 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3685 022fae89 2019-12-06 tracey if (!no_ignores) {
3686 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3687 3143d852 2020-06-25 stsp worktree->root_path, path);
3689 3143d852 2020-06-25 stsp goto done;
3691 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3692 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3693 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3696 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3697 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3698 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3699 927df6b7 2019-02-10 stsp free(ondisk_path);
3700 347d1d3e 2019-07-12 stsp return err;
3703 347d1d3e 2019-07-12 stsp const struct got_error *
3704 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3705 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3706 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3707 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3709 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3710 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3711 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3712 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3714 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3716 347d1d3e 2019-07-12 stsp return err;
3718 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3719 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3720 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3721 f6343036 2021-06-22 stsp no_ignores, 0);
3725 f8d1f275 2019-02-04 stsp free(fileindex_path);
3726 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3727 f8d1f275 2019-02-04 stsp return err;
3730 6c7ab921 2019-03-18 stsp const struct got_error *
3731 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3732 6c7ab921 2019-03-18 stsp const char *arg)
3734 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3735 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3736 6c7ab921 2019-03-18 stsp size_t len;
3737 00bb5ea0 2020-07-23 stsp struct stat sb;
3738 01740607 2020-11-04 stsp char *abspath = NULL;
3739 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3741 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3743 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3744 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3745 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3747 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3748 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3749 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3750 00bb5ea0 2020-07-23 stsp goto done;
3752 727173c3 2020-11-06 stsp sb.st_mode = 0;
3754 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3756 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3757 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3758 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3759 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3761 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3762 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3763 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3764 00bb5ea0 2020-07-23 stsp goto done;
3768 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3769 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3771 d0710d08 2019-07-22 stsp goto done;
3772 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3773 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3774 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3775 00bb5ea0 2020-07-23 stsp goto done;
3778 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3779 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3780 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3781 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3782 00bb5ea0 2020-07-23 stsp goto done;
3784 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3785 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3786 01740607 2020-11-04 stsp goto done;
3788 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3789 01740607 2020-11-04 stsp sizeof(canonpath));
3791 00bb5ea0 2020-07-23 stsp goto done;
3792 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3793 01740607 2020-11-04 stsp if (resolved == NULL) {
3794 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3795 01740607 2020-11-04 stsp goto done;
3800 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3801 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3802 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3803 6c7ab921 2019-03-18 stsp goto done;
3806 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3807 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3808 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3810 f6d88e1a 2019-05-29 stsp goto done;
3812 f6d88e1a 2019-05-29 stsp path = strdup("");
3813 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3814 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3815 f6d88e1a 2019-05-29 stsp goto done;
3819 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3820 6c7ab921 2019-03-18 stsp len = strlen(path);
3821 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3822 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3826 01740607 2020-11-04 stsp free(abspath);
3827 6c7ab921 2019-03-18 stsp free(resolved);
3828 d0710d08 2019-07-22 stsp free(cwd);
3829 6c7ab921 2019-03-18 stsp if (err == NULL)
3830 6c7ab921 2019-03-18 stsp *wt_path = path;
3832 6c7ab921 2019-03-18 stsp free(path);
3833 d00136be 2019-03-26 stsp return err;
3836 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3837 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3838 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3839 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3840 4e68cba3 2019-11-23 stsp void *progress_arg;
3841 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3844 4e68cba3 2019-11-23 stsp static const struct got_error *
3845 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3846 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3847 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3848 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3850 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3851 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3852 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3853 6d022e97 2019-08-04 stsp struct stat sb;
3854 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3856 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3857 dbb83fbd 2019-12-12 stsp relpath) == -1)
3858 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3860 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3862 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3863 12463d8b 2019-12-13 stsp de_name, a->repo);
3865 dbb83fbd 2019-12-12 stsp goto done;
3866 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3867 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3868 dbb83fbd 2019-12-12 stsp goto done;
3869 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3871 dbb83fbd 2019-12-12 stsp goto done;
3874 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3875 84bf00a6 2022-02-12 thomas if (status == GOT_STATUS_NONEXISTENT)
3876 84bf00a6 2022-02-12 thomas err = got_error_set_errno(ENOENT, ondisk_path);
3878 84bf00a6 2022-02-12 thomas err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3879 dbb83fbd 2019-12-12 stsp goto done;
3882 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3884 4e68cba3 2019-11-23 stsp goto done;
3885 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3886 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3887 3969253a 2020-03-07 stsp if (err) {
3888 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3889 3969253a 2020-03-07 stsp goto done;
3891 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3892 07f5b47a 2019-06-02 stsp if (err) {
3893 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3894 4e68cba3 2019-11-23 stsp goto done;
3897 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3899 dbb83fbd 2019-12-12 stsp return err;
3900 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3901 dbb83fbd 2019-12-12 stsp return NULL;
3902 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3905 d00136be 2019-03-26 stsp const struct got_error *
3906 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3907 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3908 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3909 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3911 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3912 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3913 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3914 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3915 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3917 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3919 d00136be 2019-03-26 stsp return err;
3921 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3923 d00136be 2019-03-26 stsp goto done;
3925 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3926 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3927 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3928 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3929 4e68cba3 2019-11-23 stsp saa.repo = repo;
3931 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3932 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3933 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3937 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3938 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3939 af12c6b9 2019-06-04 stsp err = sync_err;
3941 fb399478 2019-07-12 stsp free(fileindex_path);
3942 d00136be 2019-03-26 stsp if (fileindex)
3943 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3944 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3945 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3946 d00136be 2019-03-26 stsp err = unlockerr;
3947 6c7ab921 2019-03-18 stsp return err;
3950 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3951 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3952 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3953 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3954 f2a9dc41 2019-12-13 tracey void *progress_arg;
3955 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3956 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3957 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3958 d64cc78a 2022-01-25 thomas int ignore_missing_paths;
3959 766841c2 2020-08-13 stsp const char *status_codes;
3962 f2a9dc41 2019-12-13 tracey static const struct got_error *
3963 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3964 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3965 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3966 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3968 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3969 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3970 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3971 17ed4618 2019-06-02 stsp struct stat sb;
3972 20a2ad1c 2020-10-20 stsp char *ondisk_path;
3974 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_NONEXISTENT) {
3975 d64cc78a 2022-01-25 thomas if (a->ignore_missing_paths)
3976 d64cc78a 2022-01-25 thomas return NULL;
3977 d64cc78a 2022-01-25 thomas return got_error_set_errno(ENOENT, relpath);
3980 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3981 17ed4618 2019-06-02 stsp if (ie == NULL)
3982 d5a18ace 2022-01-25 thomas return got_error_path(relpath, GOT_ERR_FILE_STATUS);
3984 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3985 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3986 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3987 9acbc4fa 2019-08-03 stsp return NULL;
3988 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3991 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3992 f2a9dc41 2019-12-13 tracey relpath) == -1)
3993 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3995 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3998 f2a9dc41 2019-12-13 tracey goto done;
4000 766841c2 2020-08-13 stsp if (a->status_codes) {
4001 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4003 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4004 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4007 766841c2 2020-08-13 stsp if (i == ncodes) {
4008 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4009 766841c2 2020-08-13 stsp free(ondisk_path);
4010 766841c2 2020-08-13 stsp return NULL;
4012 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4013 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4014 766841c2 2020-08-13 stsp static char msg[64];
4015 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4016 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4017 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4018 766841c2 2020-08-13 stsp goto done;
4022 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4023 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4024 f2a9dc41 2019-12-13 tracey goto done;
4025 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4026 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4027 f2a9dc41 2019-12-13 tracey goto done;
4029 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4030 d64cc78a 2022-01-25 thomas err = got_error_set_errno(ENOENT, relpath);
4031 d64cc78a 2022-01-25 thomas goto done;
4033 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4034 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4035 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4036 f2a9dc41 2019-12-13 tracey goto done;
4040 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4041 20a2ad1c 2020-10-20 stsp size_t root_len;
4043 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4044 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4045 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4046 12463d8b 2019-12-13 stsp ondisk_path);
4047 12463d8b 2019-12-13 stsp goto done;
4049 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4050 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4051 12463d8b 2019-12-13 stsp goto done;
4054 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4056 20a2ad1c 2020-10-20 stsp char *parent;
4057 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4059 2513f20a 2020-10-20 stsp goto done;
4060 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4061 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4062 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4063 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4064 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4065 20a2ad1c 2020-10-20 stsp ondisk_path);
4068 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4069 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4072 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4074 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4075 f2a9dc41 2019-12-13 tracey if (err)
4076 f2a9dc41 2019-12-13 tracey return err;
4077 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4078 f2a9dc41 2019-12-13 tracey return NULL;
4079 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4080 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4083 2ec1f75b 2019-03-26 stsp const struct got_error *
4084 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4085 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4086 766841c2 2020-08-13 stsp const char *status_codes,
4087 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4088 d64cc78a 2022-01-25 thomas struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4090 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4091 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4092 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4093 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4094 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4096 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4098 2ec1f75b 2019-03-26 stsp return err;
4100 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4102 2ec1f75b 2019-03-26 stsp goto done;
4104 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4105 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4106 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4107 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4108 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4109 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4110 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4111 d64cc78a 2022-01-25 thomas sda.ignore_missing_paths = ignore_missing_paths;
4112 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4114 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4115 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4116 6092c299 2021-10-04 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4120 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4121 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4122 af12c6b9 2019-06-04 stsp err = sync_err;
4124 fb399478 2019-07-12 stsp free(fileindex_path);
4125 2ec1f75b 2019-03-26 stsp if (fileindex)
4126 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4127 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4128 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4129 2ec1f75b 2019-03-26 stsp err = unlockerr;
4130 33aa809d 2019-08-08 stsp return err;
4133 33aa809d 2019-08-08 stsp static const struct got_error *
4134 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4136 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4137 33aa809d 2019-08-08 stsp char *line = NULL;
4138 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4139 33aa809d 2019-08-08 stsp ssize_t linelen;
4141 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4142 33aa809d 2019-08-08 stsp if (linelen == -1) {
4143 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4144 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4145 33aa809d 2019-08-08 stsp goto done;
4147 33aa809d 2019-08-08 stsp return NULL;
4149 33aa809d 2019-08-08 stsp if (outfile) {
4150 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4151 33aa809d 2019-08-08 stsp if (n != linelen) {
4152 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4153 33aa809d 2019-08-08 stsp goto done;
4156 33aa809d 2019-08-08 stsp if (rejectfile) {
4157 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4158 33aa809d 2019-08-08 stsp if (n != linelen)
4159 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4162 33aa809d 2019-08-08 stsp free(line);
4163 2ec1f75b 2019-03-26 stsp return err;
4166 33aa809d 2019-08-08 stsp static const struct got_error *
4167 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4169 33aa809d 2019-08-08 stsp char *line = NULL;
4170 33aa809d 2019-08-08 stsp size_t linesize = 0;
4171 33aa809d 2019-08-08 stsp ssize_t linelen;
4173 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4174 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4175 500467ff 2019-09-25 hiltjo if (ferror(f))
4176 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4177 500467ff 2019-09-25 hiltjo return NULL;
4179 33aa809d 2019-08-08 stsp free(line);
4180 33aa809d 2019-08-08 stsp return NULL;
4183 33aa809d 2019-08-08 stsp static const struct got_error *
4184 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4185 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4186 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4188 33aa809d 2019-08-08 stsp const struct got_error *err;
4190 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4191 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4192 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4194 33aa809d 2019-08-08 stsp return err;
4195 33aa809d 2019-08-08 stsp (*line_cur1)++;
4197 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4198 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4199 33aa809d 2019-08-08 stsp if (rejectfile)
4200 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4202 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4204 33aa809d 2019-08-08 stsp return err;
4205 33aa809d 2019-08-08 stsp (*line_cur2)++;
4207 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4208 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4209 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4211 33aa809d 2019-08-08 stsp return err;
4212 33aa809d 2019-08-08 stsp (*line_cur2)++;
4214 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4215 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4216 33aa809d 2019-08-08 stsp if (rejectfile)
4217 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4219 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4221 33aa809d 2019-08-08 stsp return err;
4222 33aa809d 2019-08-08 stsp (*line_cur1)++;
4225 f1e81a05 2019-08-10 stsp return NULL;
4228 f1e81a05 2019-08-10 stsp static const struct got_error *
4229 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4230 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4232 f1e81a05 2019-08-10 stsp const struct got_error *err;
4234 f1e81a05 2019-08-10 stsp if (outfile) {
4235 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4236 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4237 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4239 f1e81a05 2019-08-10 stsp return err;
4240 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4243 f1e81a05 2019-08-10 stsp if (rejectfile) {
4244 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4245 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4246 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4248 f1e81a05 2019-08-10 stsp return err;
4249 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4253 33aa809d 2019-08-08 stsp return NULL;
4256 33aa809d 2019-08-08 stsp static const struct got_error *
4257 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4258 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4259 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4260 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4261 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4263 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4264 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4265 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4266 33aa809d 2019-08-08 stsp FILE *hunkfile;
4267 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4268 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4271 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4273 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4274 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4275 fe621944 2020-11-10 stsp start_old = cc.left.start;
4276 fe621944 2020-11-10 stsp end_old = cc.left.end;
4277 fe621944 2020-11-10 stsp start_new = cc.right.start;
4278 fe621944 2020-11-10 stsp end_new = cc.right.end;
4280 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4281 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4282 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4284 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4285 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4286 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4288 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4289 fe621944 2020-11-10 stsp if (diff_state == NULL)
4290 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4291 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4293 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4294 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4295 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4296 33aa809d 2019-08-08 stsp goto done;
4299 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4300 fe621944 2020-11-10 stsp diff_result, &cc);
4301 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4302 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4303 33aa809d 2019-08-08 stsp goto done;
4306 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4307 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4308 33aa809d 2019-08-08 stsp goto done;
4311 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4312 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4314 33aa809d 2019-08-08 stsp goto done;
4316 33aa809d 2019-08-08 stsp switch (*choice) {
4317 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4318 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4319 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4321 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4322 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4323 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4325 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4328 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4332 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4333 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4334 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4335 33aa809d 2019-08-08 stsp return err;
4338 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4339 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4340 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4341 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4342 1f1abb7e 2019-08-08 stsp void *progress_arg;
4343 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4344 33aa809d 2019-08-08 stsp void *patch_arg;
4345 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4346 10604dce 2021-09-24 thomas int unlink_added_files;
4349 e20a8b6f 2019-06-04 stsp static const struct got_error *
4350 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4351 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4352 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4353 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4354 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4356 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4357 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4358 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4359 1ebedb77 2019-10-19 stsp int fd2 = -1;
4360 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4361 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4362 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4363 fe621944 2020-11-10 stsp struct stat sb2;
4364 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4365 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4366 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4368 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4370 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4372 33aa809d 2019-08-08 stsp return err;
4374 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4375 fc63f50d 2021-12-31 thomas fd2 = openat(dirfd2, de_name2,
4376 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4377 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4378 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4379 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4380 fa3cef63 2020-07-23 stsp goto done;
4382 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4383 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4384 48b4f239 2021-12-31 thomas if (link_len == -1) {
4385 48b4f239 2021-12-31 thomas return got_error_from_errno2("readlinkat",
4388 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4389 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4392 06340621 2021-12-31 thomas fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4393 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4394 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4395 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4396 fa3cef63 2020-07-23 stsp goto done;
4398 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4399 fa3cef63 2020-07-23 stsp sizeof(link_target));
4400 fa3cef63 2020-07-23 stsp if (link_len == -1)
4401 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4402 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4403 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4406 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4407 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4408 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4409 fa3cef63 2020-07-23 stsp goto done;
4412 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4413 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4414 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4415 fa3cef63 2020-07-23 stsp goto done;
4420 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4421 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4422 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4423 fa3cef63 2020-07-23 stsp goto done;
4425 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4426 fa3cef63 2020-07-23 stsp if (n != link_len) {
4427 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4428 fa3cef63 2020-07-23 stsp goto done;
4430 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4431 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4432 fa3cef63 2020-07-23 stsp goto done;
4434 fa3cef63 2020-07-23 stsp rewind(f2);
4437 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4439 33aa809d 2019-08-08 stsp goto done;
4441 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4443 33aa809d 2019-08-08 stsp goto done;
4445 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4447 33aa809d 2019-08-08 stsp goto done;
4449 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4452 33aa809d 2019-08-08 stsp goto done;
4454 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4456 33aa809d 2019-08-08 stsp goto done;
4458 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4459 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4460 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4461 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4463 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4464 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4465 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4466 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4467 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4468 fe621944 2020-11-10 stsp nchanges++;
4470 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4471 33aa809d 2019-08-08 stsp int choice;
4472 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4473 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4474 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4475 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4476 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4477 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4479 33aa809d 2019-08-08 stsp goto done;
4480 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4481 33aa809d 2019-08-08 stsp have_content = 1;
4482 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4485 1ebedb77 2019-10-19 stsp if (have_content) {
4486 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4487 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4488 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4490 1ebedb77 2019-10-19 stsp goto done;
4492 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4493 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4494 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4495 fa3cef63 2020-07-23 stsp goto done;
4500 33aa809d 2019-08-08 stsp free(id_str);
4502 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4503 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4504 fe621944 2020-11-10 stsp if (err == NULL)
4505 fe621944 2020-11-10 stsp err = free_err;
4506 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4507 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4508 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4509 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4510 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4511 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4512 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4513 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4514 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4515 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4516 33aa809d 2019-08-08 stsp if (err || !have_content) {
4517 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4518 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4519 33aa809d 2019-08-08 stsp free(*path_outfile);
4520 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4522 33aa809d 2019-08-08 stsp free(path1);
4523 33aa809d 2019-08-08 stsp return err;
4526 33aa809d 2019-08-08 stsp static const struct got_error *
4527 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4528 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4529 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4530 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4532 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4533 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4534 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4535 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4536 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4537 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4538 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4539 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4540 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4541 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4543 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4544 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4545 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4546 d3bcc3d1 2019-08-08 stsp return NULL;
4548 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4549 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4550 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4552 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4553 65084dad 2019-08-08 stsp if (ie == NULL)
4554 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4556 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4557 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4558 a129376b 2019-03-28 stsp if (err) {
4559 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4560 a129376b 2019-03-28 stsp goto done;
4561 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4562 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4563 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4564 e20a8b6f 2019-06-04 stsp goto done;
4567 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4568 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4569 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4570 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4571 a129376b 2019-03-28 stsp goto done;
4574 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4575 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4576 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4577 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4578 a129376b 2019-03-28 stsp goto done;
4581 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4582 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4583 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4584 a129376b 2019-03-28 stsp goto done;
4589 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4590 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4591 a9fa2909 2019-07-27 stsp if (err) {
4592 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4593 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4594 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4595 a9fa2909 2019-07-27 stsp goto done;
4597 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4599 a9fa2909 2019-07-27 stsp goto done;
4601 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4603 a9fa2909 2019-07-27 stsp goto done;
4605 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4606 1233e6b6 2020-10-19 stsp free(te_name);
4607 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4608 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4609 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4610 a9fa2909 2019-07-27 stsp goto done;
4614 a129376b 2019-03-28 stsp switch (status) {
4615 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4616 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4617 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4618 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4619 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4621 33aa809d 2019-08-08 stsp goto done;
4622 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4625 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4626 1f1abb7e 2019-08-08 stsp ie->path);
4628 1ee397ad 2019-07-12 stsp goto done;
4629 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4630 10604dce 2021-09-24 thomas if (a->unlink_added_files) {
4631 10604dce 2021-09-24 thomas if (asprintf(&ondisk_path, "%s/%s",
4632 10604dce 2021-09-24 thomas got_worktree_get_root_path(a->worktree),
4633 10604dce 2021-09-24 thomas relpath) == -1) {
4634 10604dce 2021-09-24 thomas err = got_error_from_errno("asprintf");
4635 10604dce 2021-09-24 thomas goto done;
4637 10604dce 2021-09-24 thomas if (unlink(ondisk_path) == -1) {
4638 10604dce 2021-09-24 thomas err = got_error_from_errno2("unlink",
4639 10604dce 2021-09-24 thomas ondisk_path);
4644 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4645 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4646 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4647 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4648 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4650 33aa809d 2019-08-08 stsp goto done;
4651 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4654 33aa809d 2019-08-08 stsp /* fall through */
4655 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4656 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4657 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4658 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4659 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4660 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4661 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4662 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4663 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4665 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4666 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4667 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4669 65084dad 2019-08-08 stsp goto done;
4671 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4672 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4673 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4674 a129376b 2019-03-28 stsp goto done;
4677 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4678 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4679 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4680 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4681 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4682 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4683 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4685 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4686 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4687 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4688 369fd7e5 2020-07-23 stsp path_content);
4691 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4692 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4693 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4694 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4696 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4697 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4698 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4699 369fd7e5 2020-07-23 stsp goto done;
4703 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4704 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4705 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4706 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4707 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4708 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4710 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4712 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4713 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4714 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4715 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4718 a129376b 2019-03-28 stsp goto done;
4719 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4720 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4721 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4722 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4723 437adc9d 2020-12-10 yzhong blob->id.sha1,
4724 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4726 2e1fa222 2020-07-23 stsp goto done;
4728 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4729 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4730 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4739 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4740 33aa809d 2019-08-08 stsp free(path_content);
4741 e20a8b6f 2019-06-04 stsp free(parent_path);
4742 a129376b 2019-03-28 stsp free(tree_path);
4744 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4746 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4747 a129376b 2019-03-28 stsp free(tree_id);
4748 e20a8b6f 2019-06-04 stsp return err;
4751 e20a8b6f 2019-06-04 stsp const struct got_error *
4752 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4753 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4754 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4755 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4756 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4758 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4759 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4760 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4761 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4762 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4763 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4765 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4767 e20a8b6f 2019-06-04 stsp return err;
4769 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4771 e20a8b6f 2019-06-04 stsp goto done;
4773 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4774 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4775 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4776 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4777 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4778 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4779 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4780 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
4781 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4782 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4783 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
4787 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4788 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4789 e20a8b6f 2019-06-04 stsp err = sync_err;
4791 fb399478 2019-07-12 stsp free(fileindex_path);
4792 a129376b 2019-03-28 stsp if (fileindex)
4793 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4794 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4795 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4796 a129376b 2019-03-28 stsp err = unlockerr;
4797 c4296144 2019-05-09 stsp return err;
4800 cf066bf8 2019-05-09 stsp static void
4801 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4803 24519714 2019-05-09 stsp free(ct->path);
4804 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4805 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4806 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4807 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4808 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4809 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4813 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4814 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4815 24519714 2019-05-09 stsp struct got_repository *repo;
4816 24519714 2019-05-09 stsp struct got_worktree *worktree;
4817 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4818 5f8a88c6 2019-08-03 stsp int have_staged_files;
4819 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4822 c4296144 2019-05-09 stsp static const struct got_error *
4823 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4824 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4825 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4826 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4828 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4829 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4830 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4831 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4832 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4833 768aea60 2019-05-09 stsp struct stat sb;
4835 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4836 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4837 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4838 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4839 5f8a88c6 2019-08-03 stsp return NULL;
4841 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4842 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4844 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4845 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4846 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4847 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4848 5f8a88c6 2019-08-03 stsp return NULL;
4851 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4852 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4853 036813ee 2019-05-09 stsp goto done;
4855 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4856 036813ee 2019-05-09 stsp parent_path = strdup("");
4857 69960a46 2019-05-09 stsp if (parent_path == NULL)
4858 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4860 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4862 69960a46 2019-05-09 stsp return err;
4865 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4866 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4867 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4868 c4296144 2019-05-09 stsp goto done;
4871 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4872 768aea60 2019-05-09 stsp relpath) == -1) {
4873 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4874 768aea60 2019-05-09 stsp goto done;
4877 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4878 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4879 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4880 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4881 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4882 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4883 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4884 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4886 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4887 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4890 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4891 0aeb8099 2020-07-23 stsp goto done;
4893 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4894 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4895 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4896 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4897 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4898 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4899 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4900 12463d8b 2019-12-13 stsp ct->ondisk_path);
4901 12463d8b 2019-12-13 stsp goto done;
4903 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4904 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4905 768aea60 2019-05-09 stsp goto done;
4907 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4910 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4911 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4912 44d03001 2019-05-09 stsp relpath) == -1) {
4913 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4914 44d03001 2019-05-09 stsp goto done;
4917 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4918 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4919 35213c7c 2020-07-23 stsp int is_bad_symlink;
4920 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4921 35213c7c 2020-07-23 stsp ssize_t target_len;
4922 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4923 35213c7c 2020-07-23 stsp sizeof(target_path));
4924 35213c7c 2020-07-23 stsp if (target_len == -1) {
4925 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4926 35213c7c 2020-07-23 stsp ct->ondisk_path);
4927 35213c7c 2020-07-23 stsp goto done;
4929 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4930 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4932 35213c7c 2020-07-23 stsp goto done;
4933 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4934 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4935 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4936 35213c7c 2020-07-23 stsp goto done;
4941 cf066bf8 2019-05-09 stsp ct->status = status;
4942 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4943 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4944 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4945 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4946 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4947 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4948 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4949 b416585c 2019-05-13 stsp goto done;
4951 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4952 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4953 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4954 f0b75401 2019-08-03 stsp goto done;
4957 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4958 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4959 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4960 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4961 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4962 036813ee 2019-05-09 stsp goto done;
4965 24519714 2019-05-09 stsp ct->path = strdup(path);
4966 24519714 2019-05-09 stsp if (ct->path == NULL) {
4967 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4968 24519714 2019-05-09 stsp goto done;
4970 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4972 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4973 ed175427 2019-05-09 stsp free_commitable(ct);
4974 24519714 2019-05-09 stsp free(parent_path);
4975 036813ee 2019-05-09 stsp free(path);
4976 a129376b 2019-03-28 stsp return err;
4979 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4980 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4981 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4982 036813ee 2019-05-09 stsp struct got_repository *);
4984 ed175427 2019-05-09 stsp static const struct got_error *
4985 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4986 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4987 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4988 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4989 afa376bf 2019-05-09 stsp struct got_repository *repo)
4991 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4992 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4993 036813ee 2019-05-09 stsp char *subpath;
4995 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4996 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4997 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4999 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5001 ed175427 2019-05-09 stsp return err;
5003 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5004 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5005 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5006 036813ee 2019-05-09 stsp free(subpath);
5007 036813ee 2019-05-09 stsp return err;
5010 036813ee 2019-05-09 stsp static const struct got_error *
5011 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5013 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5014 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5016 036813ee 2019-05-09 stsp *match = 0;
5018 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5019 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5020 0f63689d 2019-05-10 stsp return NULL;
5023 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5025 0f63689d 2019-05-10 stsp return err;
5026 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5027 036813ee 2019-05-09 stsp free(ct_parent_path);
5028 036813ee 2019-05-09 stsp return err;
5031 768aea60 2019-05-09 stsp static mode_t
5032 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5034 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5035 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5037 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5040 036813ee 2019-05-09 stsp static const struct got_error *
5041 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5042 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5044 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5046 036813ee 2019-05-09 stsp *new_te = NULL;
5048 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5050 036813ee 2019-05-09 stsp goto done;
5052 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5054 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5055 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5056 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5058 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5060 036813ee 2019-05-09 stsp if (err && *new_te) {
5061 56e0773d 2019-11-28 stsp free(*new_te);
5062 036813ee 2019-05-09 stsp *new_te = NULL;
5064 036813ee 2019-05-09 stsp return err;
5067 036813ee 2019-05-09 stsp static const struct got_error *
5068 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5069 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5071 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5072 102b254e 2020-10-19 stsp char *ct_name = NULL;
5074 036813ee 2019-05-09 stsp *new_te = NULL;
5076 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5077 036813ee 2019-05-09 stsp if (*new_te == NULL)
5078 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5080 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5082 036813ee 2019-05-09 stsp goto done;
5083 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5084 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5085 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5086 036813ee 2019-05-09 stsp goto done;
5089 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5091 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5092 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5093 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5095 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5097 102b254e 2020-10-19 stsp free(ct_name);
5098 036813ee 2019-05-09 stsp if (err && *new_te) {
5099 56e0773d 2019-11-28 stsp free(*new_te);
5100 036813ee 2019-05-09 stsp *new_te = NULL;
5102 036813ee 2019-05-09 stsp return err;
5105 036813ee 2019-05-09 stsp static const struct got_error *
5106 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5107 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5109 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5110 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5112 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5114 036813ee 2019-05-09 stsp return err;
5115 036813ee 2019-05-09 stsp if (new_pe == NULL)
5116 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5117 036813ee 2019-05-09 stsp return NULL;
5120 afa376bf 2019-05-09 stsp static const struct got_error *
5121 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5122 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5124 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5125 5f8a88c6 2019-08-03 stsp unsigned char status;
5127 ae1e948a 2021-09-28 thomas if (status_cb == NULL) /* no commit progress output desired */
5128 ae1e948a 2021-09-28 thomas return NULL;
5130 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5131 afa376bf 2019-05-09 stsp ct_path++;
5133 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5134 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5136 5f8a88c6 2019-08-03 stsp status = ct->status;
5138 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5139 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5142 036813ee 2019-05-09 stsp static const struct got_error *
5143 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5144 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5146 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5147 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5148 44d03001 2019-05-09 stsp char *te_path;
5150 44d03001 2019-05-09 stsp *modified = 0;
5152 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5153 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5154 44d03001 2019-05-09 stsp te->name) == -1)
5155 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5157 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5158 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5159 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5160 44d03001 2019-05-09 stsp strlen(te_path));
5161 62d463ca 2020-10-20 naddy if (*modified)
5165 44d03001 2019-05-09 stsp free(te_path);
5166 44d03001 2019-05-09 stsp return err;
5169 44d03001 2019-05-09 stsp static const struct got_error *
5170 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5171 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5172 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5174 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5175 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5177 036813ee 2019-05-09 stsp *ctp = NULL;
5179 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5180 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5181 036813ee 2019-05-09 stsp char *ct_name = NULL;
5182 036813ee 2019-05-09 stsp int path_matches;
5184 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5185 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5186 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5187 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5190 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5191 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5195 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5198 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5200 036813ee 2019-05-09 stsp return err;
5201 036813ee 2019-05-09 stsp if (!path_matches)
5204 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5206 d34b633e 2020-10-19 stsp return err;
5208 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5209 d34b633e 2020-10-19 stsp free(ct_name);
5212 d34b633e 2020-10-19 stsp free(ct_name);
5214 036813ee 2019-05-09 stsp *ctp = ct;
5218 2b496619 2019-07-10 stsp return err;
5221 2b496619 2019-07-10 stsp static const struct got_error *
5222 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5223 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5224 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5225 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5226 2b496619 2019-07-10 stsp struct got_repository *repo)
5228 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5229 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5230 2b496619 2019-07-10 stsp char *subtree_path;
5231 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5232 ba580f68 2020-03-22 stsp int nentries;
5234 2b496619 2019-07-10 stsp *new_tep = NULL;
5236 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5237 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5238 2b496619 2019-07-10 stsp child_path) == -1)
5239 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5241 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5242 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5243 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5244 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5246 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5247 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5248 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5249 2b496619 2019-07-10 stsp goto done;
5251 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5252 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5253 2b496619 2019-07-10 stsp if (err) {
5254 56e0773d 2019-11-28 stsp free(new_te);
5255 2b496619 2019-07-10 stsp goto done;
5257 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5260 2b496619 2019-07-10 stsp free(subtree_path);
5261 2b496619 2019-07-10 stsp if (err == NULL)
5262 2b496619 2019-07-10 stsp *new_tep = new_te;
5263 036813ee 2019-05-09 stsp return err;
5266 036813ee 2019-05-09 stsp static const struct got_error *
5267 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5268 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5269 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5270 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5271 036813ee 2019-05-09 stsp struct got_repository *repo)
5273 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5274 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5275 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5276 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5278 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5279 ba580f68 2020-03-22 stsp *nentries = 0;
5281 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5282 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5283 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5284 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5286 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5287 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5288 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5291 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5292 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5295 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5296 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5298 036813ee 2019-05-09 stsp goto done;
5300 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5301 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5302 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5304 036813ee 2019-05-09 stsp goto done;
5305 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5307 afa376bf 2019-05-09 stsp goto done;
5308 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5309 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5311 2f51b5b3 2019-05-09 stsp goto done;
5312 ba580f68 2020-03-22 stsp (*nentries)++;
5314 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5315 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5316 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5317 2b496619 2019-07-10 stsp == NULL) {
5318 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5319 2b496619 2019-07-10 stsp child_path, path_base_tree,
5320 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5323 2b496619 2019-07-10 stsp goto done;
5324 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5326 2b496619 2019-07-10 stsp goto done;
5327 ba580f68 2020-03-22 stsp (*nentries)++;
5332 2f51b5b3 2019-05-09 stsp if (base_tree) {
5333 56e0773d 2019-11-28 stsp int i, nbase_entries;
5334 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5335 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5336 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5337 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5339 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5340 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5341 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5342 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5344 63c5ca5d 2019-08-24 stsp goto done;
5345 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5347 63c5ca5d 2019-08-24 stsp goto done;
5348 ba580f68 2020-03-22 stsp (*nentries)++;
5352 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5353 44d03001 2019-05-09 stsp int modified;
5354 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5356 036813ee 2019-05-09 stsp goto done;
5357 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5358 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5360 2f51b5b3 2019-05-09 stsp goto done;
5361 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5362 44d03001 2019-05-09 stsp if (modified) {
5363 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5364 ba580f68 2020-03-22 stsp int nsubentries;
5365 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5366 ba580f68 2020-03-22 stsp &nsubentries, te,
5367 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5368 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5370 44d03001 2019-05-09 stsp goto done;
5371 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5372 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5373 ba580f68 2020-03-22 stsp free(new_id);
5376 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5377 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5378 56e0773d 2019-11-28 stsp free(new_id);
5380 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5382 036813ee 2019-05-09 stsp goto done;
5383 ba580f68 2020-03-22 stsp (*nentries)++;
5387 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5388 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5390 f66c734c 2019-09-22 stsp goto done;
5392 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5393 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5394 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5395 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5396 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5397 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5399 2f51b5b3 2019-05-09 stsp goto done;
5400 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5402 2f51b5b3 2019-05-09 stsp goto done;
5403 ba580f68 2020-03-22 stsp (*nentries)++;
5405 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5406 b416585c 2019-05-13 stsp status_arg);
5408 afa376bf 2019-05-09 stsp goto done;
5410 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5411 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5413 2f51b5b3 2019-05-09 stsp goto done;
5414 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5416 2f51b5b3 2019-05-09 stsp goto done;
5417 ba580f68 2020-03-22 stsp (*nentries)++;
5422 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5423 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5425 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5426 2e1fa222 2020-07-23 stsp return err;
5429 2e1fa222 2020-07-23 stsp static const struct got_error *
5430 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5431 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5432 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5433 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5435 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5436 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5437 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5439 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5440 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5441 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5443 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5445 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5446 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5447 437adc9d 2020-12-10 yzhong if (err)
5448 437adc9d 2020-12-10 yzhong goto done;
5451 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5452 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5453 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5454 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5455 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5456 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5457 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5458 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5460 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5461 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5462 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5463 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5464 72fd46fa 2019-09-06 stsp !have_staged_files);
5466 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5467 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5468 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5469 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5470 72fd46fa 2019-09-06 stsp !have_staged_files);
5472 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5474 437adc9d 2020-12-10 yzhong goto done;
5475 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5476 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5477 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5478 3969253a 2020-03-07 stsp if (err) {
5479 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5480 437adc9d 2020-12-10 yzhong goto done;
5482 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5483 3969253a 2020-03-07 stsp if (err) {
5484 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5485 437adc9d 2020-12-10 yzhong goto done;
5488 437adc9d 2020-12-10 yzhong free(relpath);
5489 437adc9d 2020-12-10 yzhong relpath = NULL;
5492 437adc9d 2020-12-10 yzhong free(relpath);
5493 d56d26ce 2019-05-10 stsp return err;
5497 d56d26ce 2019-05-10 stsp static const struct got_error *
5498 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5499 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5500 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5501 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5502 735ef5ac 2019-08-03 stsp int ood_errcode)
5504 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5505 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5507 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5508 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5509 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5510 1a36436d 2019-06-10 stsp return NULL;
5512 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5513 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5515 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5516 735ef5ac 2019-08-03 stsp in_repo_path);
5517 9bead371 2019-07-28 stsp if (err) {
5518 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5519 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5520 1a36436d 2019-06-10 stsp goto done;
5521 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5522 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5524 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5525 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5526 735ef5ac 2019-08-03 stsp in_repo_path);
5527 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5528 1a36436d 2019-06-10 stsp goto done;
5529 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5533 1a36436d 2019-06-10 stsp return err;
5536 c4296144 2019-05-09 stsp const struct got_error *
5537 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5538 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5539 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id,
5540 10604dce 2021-09-24 thomas struct got_object_id *parent_id2,
5541 10604dce 2021-09-24 thomas struct got_worktree *worktree,
5542 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5543 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5544 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5545 afa376bf 2019-05-09 stsp struct got_repository *repo)
5547 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5548 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5549 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5550 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5551 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5552 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5553 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5554 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5555 10604dce 2021-09-24 thomas int nentries, nparents = 0;
5556 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5557 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5558 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5560 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5562 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5564 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5566 588edf97 2019-05-10 stsp goto done;
5568 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5570 588edf97 2019-05-10 stsp goto done;
5572 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5573 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5578 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5579 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5583 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5584 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5585 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5586 cf066bf8 2019-05-09 stsp char *ondisk_path;
5588 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5589 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5590 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5593 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5594 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5595 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5598 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5599 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5600 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5601 cf066bf8 2019-05-09 stsp goto done;
5603 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5604 2e1fa222 2020-07-23 stsp free(ondisk_path);
5606 cf066bf8 2019-05-09 stsp goto done;
5609 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5610 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5611 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5613 036813ee 2019-05-09 stsp goto done;
5615 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5617 de18fc63 2019-05-09 stsp goto done;
5618 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5619 10604dce 2021-09-24 thomas nparents++;
5620 10604dce 2021-09-24 thomas if (parent_id2) {
5621 10604dce 2021-09-24 thomas err = got_object_qid_alloc(&pid, parent_id2);
5622 10604dce 2021-09-24 thomas if (err)
5623 10604dce 2021-09-24 thomas goto done;
5624 10604dce 2021-09-24 thomas STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5625 10604dce 2021-09-24 thomas nparents++;
5627 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5628 10604dce 2021-09-24 thomas nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5629 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5630 33ad4cbe 2019-05-12 jcs free(logmsg);
5632 9d40349a 2019-05-09 stsp goto done;
5634 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5635 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5636 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5637 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5638 09f5bd90 2019-05-09 stsp goto done;
5640 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5641 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5643 09f5bd90 2019-05-09 stsp goto done;
5644 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5646 ebf99748 2019-05-09 stsp goto done;
5647 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5648 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5649 09f5bd90 2019-05-09 stsp goto done;
5651 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5652 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5654 f2c16586 2019-05-09 stsp goto done;
5655 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5657 f2c16586 2019-05-09 stsp goto done;
5659 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5661 09f5bd90 2019-05-09 stsp goto done;
5663 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5665 ebf99748 2019-05-09 stsp goto done;
5667 10604dce 2021-09-24 thomas got_object_id_queue_free(&parent_ids);
5668 588edf97 2019-05-10 stsp if (head_tree)
5669 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5670 588edf97 2019-05-10 stsp if (head_commit)
5671 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5672 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5673 2f17228e 2019-05-12 stsp if (head_ref2) {
5674 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5675 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5676 2f17228e 2019-05-12 stsp err = unlockerr;
5677 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5679 39cd0ff6 2019-07-12 stsp return err;
5682 5c1e53bc 2019-07-28 stsp static const struct got_error *
5683 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5684 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5686 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5687 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5689 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5690 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5691 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5693 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5694 5c1e53bc 2019-07-28 stsp ct_path++;
5696 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5697 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5701 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5702 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5704 5c1e53bc 2019-07-28 stsp return NULL;
5707 f0b75401 2019-08-03 stsp static const struct got_error *
5708 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5710 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5712 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5713 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5714 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5717 f0b75401 2019-08-03 stsp return NULL;
5720 5f8a88c6 2019-08-03 stsp static const struct got_error *
5721 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5722 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5724 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5725 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5727 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5728 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5730 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5731 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5732 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5733 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5734 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5735 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5738 5f8a88c6 2019-08-03 stsp return NULL;
5741 39cd0ff6 2019-07-12 stsp const struct got_error *
5742 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5743 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5744 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5745 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5746 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5747 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5749 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5750 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5751 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5752 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5753 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5754 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5755 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5756 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5757 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5759 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5761 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5763 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5765 39cd0ff6 2019-07-12 stsp goto done;
5767 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5769 39cd0ff6 2019-07-12 stsp goto done;
5771 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5773 39cd0ff6 2019-07-12 stsp goto done;
5775 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5777 39cd0ff6 2019-07-12 stsp goto done;
5779 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5780 5f8a88c6 2019-08-03 stsp &have_staged_files);
5781 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5782 5f8a88c6 2019-08-03 stsp goto done;
5783 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5784 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5786 5f8a88c6 2019-08-03 stsp goto done;
5789 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5790 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5791 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5792 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5793 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5794 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5795 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5796 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5797 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
5799 5c1e53bc 2019-07-28 stsp goto done;
5802 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5803 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5804 39cd0ff6 2019-07-12 stsp goto done;
5807 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5808 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5810 5c1e53bc 2019-07-28 stsp goto done;
5813 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5814 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5815 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5817 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5818 f0b75401 2019-08-03 stsp ct_path++;
5819 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5820 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5821 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5823 b50cabdf 2019-07-12 stsp goto done;
5827 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5828 10604dce 2021-09-24 thomas head_commit_id, NULL, worktree, author, committer,
5829 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5831 39cd0ff6 2019-07-12 stsp goto done;
5833 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5834 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5835 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5836 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5837 39cd0ff6 2019-07-12 stsp err = sync_err;
5839 39cd0ff6 2019-07-12 stsp if (fileindex)
5840 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5841 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5842 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5843 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5844 39cd0ff6 2019-07-12 stsp err = unlockerr;
5845 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5846 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5847 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5849 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5850 c4296144 2019-05-09 stsp return err;
5853 8656d6c4 2019-05-20 stsp const char *
5854 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5856 8656d6c4 2019-05-20 stsp return ct->path;
5859 8656d6c4 2019-05-20 stsp unsigned int
5860 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5862 8656d6c4 2019-05-20 stsp return ct->status;
5865 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5866 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5867 818c7501 2019-07-11 stsp struct got_repository *repo;
5870 818c7501 2019-07-11 stsp static const struct got_error *
5871 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5873 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5874 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5875 818c7501 2019-07-11 stsp unsigned char status;
5876 818c7501 2019-07-11 stsp struct stat sb;
5877 818c7501 2019-07-11 stsp char *ondisk_path;
5879 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5880 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5881 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5882 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5884 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5886 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5888 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5889 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5890 818c7501 2019-07-11 stsp free(ondisk_path);
5892 818c7501 2019-07-11 stsp return err;
5894 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5895 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5896 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5897 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5899 818c7501 2019-07-11 stsp return NULL;
5902 818c7501 2019-07-11 stsp const struct got_error *
5903 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5904 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5905 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5906 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5908 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5909 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5910 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5911 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5912 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5913 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5914 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5916 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5917 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5918 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5920 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5922 818c7501 2019-07-11 stsp return err;
5924 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5926 818c7501 2019-07-11 stsp goto done;
5928 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5929 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5930 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5933 818c7501 2019-07-11 stsp goto done;
5935 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5937 818c7501 2019-07-11 stsp goto done;
5939 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5941 818c7501 2019-07-11 stsp goto done;
5943 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5945 818c7501 2019-07-11 stsp goto done;
5947 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5950 e51d7b55 2020-01-04 stsp goto done;
5952 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5954 818c7501 2019-07-11 stsp goto done;
5955 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5956 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5957 e51d7b55 2020-01-04 stsp goto done;
5960 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5961 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5963 818c7501 2019-07-11 stsp goto done;
5964 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5966 818c7501 2019-07-11 stsp goto done;
5968 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5970 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5972 818c7501 2019-07-11 stsp goto done;
5974 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5976 818c7501 2019-07-11 stsp goto done;
5978 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5979 818c7501 2019-07-11 stsp worktree->base_commit_id);
5981 818c7501 2019-07-11 stsp goto done;
5982 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5984 818c7501 2019-07-11 stsp goto done;
5986 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5988 818c7501 2019-07-11 stsp goto done;
5990 818c7501 2019-07-11 stsp free(fileindex_path);
5991 818c7501 2019-07-11 stsp free(tmp_branch_name);
5992 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5993 818c7501 2019-07-11 stsp free(branch_ref_name);
5994 818c7501 2019-07-11 stsp if (branch_ref)
5995 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5996 818c7501 2019-07-11 stsp if (wt_branch)
5997 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5998 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5999 818c7501 2019-07-11 stsp if (err) {
6000 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6001 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6002 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6004 818c7501 2019-07-11 stsp if (*tmp_branch) {
6005 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6006 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6008 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6009 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6010 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6012 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6014 818c7501 2019-07-11 stsp return err;
6017 818c7501 2019-07-11 stsp const struct got_error *
6018 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6019 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6020 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6021 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6023 818c7501 2019-07-11 stsp const struct got_error *err;
6024 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6025 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6026 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6027 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6028 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6030 818c7501 2019-07-11 stsp *commit_id = NULL;
6031 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6032 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6033 3e3a69f1 2019-07-25 stsp *branch = NULL;
6034 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6036 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6038 3e3a69f1 2019-07-25 stsp return err;
6040 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6042 f032f1f7 2019-08-04 stsp goto done;
6044 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6045 f032f1f7 2019-08-04 stsp &have_staged_files);
6046 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6047 f032f1f7 2019-08-04 stsp goto done;
6048 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6049 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6050 3e3a69f1 2019-07-25 stsp goto done;
6053 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6055 f032f1f7 2019-08-04 stsp goto done;
6057 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6059 818c7501 2019-07-11 stsp goto done;
6061 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6063 818c7501 2019-07-11 stsp goto done;
6065 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6067 818c7501 2019-07-11 stsp goto done;
6069 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6071 818c7501 2019-07-11 stsp goto done;
6073 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6074 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6076 818c7501 2019-07-11 stsp goto done;
6078 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6080 818c7501 2019-07-11 stsp goto done;
6082 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6084 818c7501 2019-07-11 stsp goto done;
6086 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6087 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6089 818c7501 2019-07-11 stsp goto done;
6091 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6093 818c7501 2019-07-11 stsp goto done;
6095 818c7501 2019-07-11 stsp free(commit_ref_name);
6096 818c7501 2019-07-11 stsp free(branch_ref_name);
6097 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6098 818c7501 2019-07-11 stsp if (commit_ref)
6099 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6100 818c7501 2019-07-11 stsp if (branch_ref)
6101 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6102 818c7501 2019-07-11 stsp if (err) {
6103 818c7501 2019-07-11 stsp free(*commit_id);
6104 818c7501 2019-07-11 stsp *commit_id = NULL;
6105 818c7501 2019-07-11 stsp if (*tmp_branch) {
6106 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6107 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6109 818c7501 2019-07-11 stsp if (*new_base_branch) {
6110 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6111 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6113 818c7501 2019-07-11 stsp if (*branch) {
6114 818c7501 2019-07-11 stsp got_ref_close(*branch);
6115 818c7501 2019-07-11 stsp *branch = NULL;
6117 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6118 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6119 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6121 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6123 818c7501 2019-07-11 stsp return err;
6126 818c7501 2019-07-11 stsp const struct got_error *
6127 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6129 818c7501 2019-07-11 stsp const struct got_error *err;
6130 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6132 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6134 818c7501 2019-07-11 stsp return err;
6136 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6137 818c7501 2019-07-11 stsp free(tmp_branch_name);
6138 818c7501 2019-07-11 stsp return NULL;
6141 818c7501 2019-07-11 stsp static const struct got_error *
6142 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6143 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6145 0ebf8283 2019-07-24 stsp *logmsg = arg;
6146 818c7501 2019-07-11 stsp return NULL;
6149 818c7501 2019-07-11 stsp static const struct got_error *
6150 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6151 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6152 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6153 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6155 818c7501 2019-07-11 stsp return NULL;
6158 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6159 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6160 01757395 2019-07-12 stsp void *progress_arg;
6161 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6164 01757395 2019-07-12 stsp static const struct got_error *
6165 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6167 01757395 2019-07-12 stsp const struct got_error *err;
6168 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6170 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6172 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6174 01757395 2019-07-12 stsp return err;
6176 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6177 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6178 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6179 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6180 01757395 2019-07-12 stsp return NULL;
6182 01757395 2019-07-12 stsp p = strdup(path);
6183 01757395 2019-07-12 stsp if (p == NULL)
6184 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6186 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6187 01757395 2019-07-12 stsp if (err || new == NULL)
6189 01757395 2019-07-12 stsp return err;
6193 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6195 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6197 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6198 01757395 2019-07-12 stsp free((char *)pe->path);
6200 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6203 0ebf8283 2019-07-24 stsp static const struct got_error *
6204 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6205 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6207 818c7501 2019-07-11 stsp const struct got_error *err;
6208 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6210 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6211 818c7501 2019-07-11 stsp if (err) {
6212 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6213 818c7501 2019-07-11 stsp goto done;
6214 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6216 818c7501 2019-07-11 stsp goto done;
6217 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6219 818c7501 2019-07-11 stsp goto done;
6220 de05890f 2020-03-05 stsp } else if (is_rebase) {
6221 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6224 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6226 818c7501 2019-07-11 stsp goto done;
6227 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6228 818c7501 2019-07-11 stsp free(stored_id);
6229 818c7501 2019-07-11 stsp if (cmp != 0) {
6230 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6231 818c7501 2019-07-11 stsp goto done;
6235 0ebf8283 2019-07-24 stsp if (commit_ref)
6236 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6237 0ebf8283 2019-07-24 stsp return err;
6240 0ebf8283 2019-07-24 stsp static const struct got_error *
6241 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6242 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6243 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6244 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6245 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6246 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6248 0ebf8283 2019-07-24 stsp const struct got_error *err;
6249 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6250 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6251 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6253 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6255 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6257 0ebf8283 2019-07-24 stsp return err;
6259 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6260 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6261 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6262 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6263 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6264 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6265 818c7501 2019-07-11 stsp if (commit_ref)
6266 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6267 818c7501 2019-07-11 stsp return err;
6270 818c7501 2019-07-11 stsp const struct got_error *
6271 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6272 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6273 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6274 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6275 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6276 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6278 0ebf8283 2019-07-24 stsp const struct got_error *err;
6279 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6281 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6283 0ebf8283 2019-07-24 stsp return err;
6285 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6287 0ebf8283 2019-07-24 stsp goto done;
6289 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6290 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6291 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6293 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6294 0ebf8283 2019-07-24 stsp return err;
6297 0ebf8283 2019-07-24 stsp const struct got_error *
6298 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6299 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6300 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6301 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6302 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6303 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6305 0ebf8283 2019-07-24 stsp const struct got_error *err;
6306 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6308 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6310 0ebf8283 2019-07-24 stsp return err;
6312 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6314 0ebf8283 2019-07-24 stsp goto done;
6316 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6317 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6318 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6320 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6321 0ebf8283 2019-07-24 stsp return err;
6324 0ebf8283 2019-07-24 stsp static const struct got_error *
6325 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6326 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6327 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6328 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6329 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6331 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6332 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6333 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6334 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6335 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6336 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6337 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6339 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6340 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6342 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6344 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6346 3e3a69f1 2019-07-25 stsp return err;
6348 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6349 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6350 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6351 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6353 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6354 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6356 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6357 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6358 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6359 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6360 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6361 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6363 01757395 2019-07-12 stsp if (merged_paths) {
6364 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6365 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6366 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6367 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6370 01757395 2019-07-12 stsp goto done;
6373 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6374 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6376 01757395 2019-07-12 stsp goto done;
6379 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6380 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6381 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6383 a0e95631 2019-07-12 stsp goto done;
6384 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6385 a0e95631 2019-07-12 stsp goto done;
6388 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6390 edd02c5e 2019-07-11 stsp goto done;
6392 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6394 818c7501 2019-07-11 stsp goto done;
6396 5943eee2 2019-08-13 stsp if (new_logmsg) {
6397 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6398 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6399 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6400 5943eee2 2019-08-13 stsp goto done;
6403 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6405 5943eee2 2019-08-13 stsp goto done;
6408 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6409 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6410 10604dce 2021-09-24 thomas NULL, worktree, got_object_commit_get_author(orig_commit),
6411 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6412 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6414 a0e95631 2019-07-12 stsp goto done;
6416 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6418 a0e95631 2019-07-12 stsp goto done;
6420 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6422 a0e95631 2019-07-12 stsp goto done;
6424 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6425 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6426 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6427 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6428 a0e95631 2019-07-12 stsp err = sync_err;
6430 a0e95631 2019-07-12 stsp free(fileindex_path);
6431 a0e95631 2019-07-12 stsp free(head_commit_id);
6432 a0e95631 2019-07-12 stsp if (head_ref)
6433 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6434 818c7501 2019-07-11 stsp if (err) {
6435 818c7501 2019-07-11 stsp free(*new_commit_id);
6436 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6438 818c7501 2019-07-11 stsp return err;
6441 818c7501 2019-07-11 stsp const struct got_error *
6442 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6443 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6444 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6445 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6446 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6448 0ebf8283 2019-07-24 stsp const struct got_error *err;
6449 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6450 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6451 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6453 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6455 0ebf8283 2019-07-24 stsp return err;
6457 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6459 0ebf8283 2019-07-24 stsp goto done;
6460 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6462 0ebf8283 2019-07-24 stsp goto done;
6463 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6464 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6465 0ebf8283 2019-07-24 stsp goto done;
6468 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6469 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6471 0ebf8283 2019-07-24 stsp if (commit_ref)
6472 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6473 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6474 0ebf8283 2019-07-24 stsp free(commit_id);
6475 0ebf8283 2019-07-24 stsp return err;
6478 0ebf8283 2019-07-24 stsp const struct got_error *
6479 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6480 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6481 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6482 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6483 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6484 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6486 0ebf8283 2019-07-24 stsp const struct got_error *err;
6487 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6488 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6490 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6492 0ebf8283 2019-07-24 stsp return err;
6494 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6496 0ebf8283 2019-07-24 stsp goto done;
6498 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6499 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6501 0ebf8283 2019-07-24 stsp if (commit_ref)
6502 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6503 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6504 0ebf8283 2019-07-24 stsp return err;
6507 0ebf8283 2019-07-24 stsp const struct got_error *
6508 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6509 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6511 3e3a69f1 2019-07-25 stsp if (fileindex)
6512 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6513 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6516 69844fba 2019-07-11 stsp static const struct got_error *
6517 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6519 69844fba 2019-07-11 stsp const struct got_error *err;
6520 69844fba 2019-07-11 stsp struct got_reference *ref;
6522 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6523 69844fba 2019-07-11 stsp if (err) {
6524 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6525 69844fba 2019-07-11 stsp return NULL;
6526 69844fba 2019-07-11 stsp return err;
6529 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6530 69844fba 2019-07-11 stsp got_ref_close(ref);
6531 69844fba 2019-07-11 stsp return err;
6534 69844fba 2019-07-11 stsp static const struct got_error *
6535 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6537 69844fba 2019-07-11 stsp const struct got_error *err;
6538 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6539 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6541 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6543 69844fba 2019-07-11 stsp goto done;
6544 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6546 69844fba 2019-07-11 stsp goto done;
6548 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6550 69844fba 2019-07-11 stsp goto done;
6551 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6553 69844fba 2019-07-11 stsp goto done;
6555 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6557 69844fba 2019-07-11 stsp goto done;
6558 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6560 69844fba 2019-07-11 stsp goto done;
6562 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6564 69844fba 2019-07-11 stsp goto done;
6565 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6567 69844fba 2019-07-11 stsp goto done;
6570 69844fba 2019-07-11 stsp free(tmp_branch_name);
6571 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6572 69844fba 2019-07-11 stsp free(branch_ref_name);
6573 69844fba 2019-07-11 stsp free(commit_ref_name);
6574 e600f124 2021-03-21 stsp return err;
6577 e600f124 2021-03-21 stsp const struct got_error *
6578 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6579 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6581 e600f124 2021-03-21 stsp const struct got_error *err;
6582 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6583 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6584 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6585 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6586 e600f124 2021-03-21 stsp char *refname = NULL;
6588 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6589 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6590 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6591 e600f124 2021-03-21 stsp branch_name += 11;
6593 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6595 e600f124 2021-03-21 stsp return err;
6597 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6598 e600f124 2021-03-21 stsp new_id_str) == -1) {
6599 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6600 e600f124 2021-03-21 stsp goto done;
6603 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6605 e600f124 2021-03-21 stsp goto done;
6607 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6609 e600f124 2021-03-21 stsp goto done;
6611 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6613 e600f124 2021-03-21 stsp free(new_id_str);
6614 e600f124 2021-03-21 stsp free(refname);
6615 e600f124 2021-03-21 stsp free(old_commit_id);
6617 e600f124 2021-03-21 stsp got_ref_close(ref);
6618 69844fba 2019-07-11 stsp return err;
6621 818c7501 2019-07-11 stsp const struct got_error *
6622 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6623 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6624 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6625 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6627 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6628 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6629 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6631 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6633 818c7501 2019-07-11 stsp return err;
6635 e600f124 2021-03-21 stsp if (create_backup) {
6636 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6637 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6639 e600f124 2021-03-21 stsp goto done;
6642 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6644 818c7501 2019-07-11 stsp goto done;
6646 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6648 818c7501 2019-07-11 stsp goto done;
6650 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6652 818c7501 2019-07-11 stsp goto done;
6654 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6656 a615e0e7 2020-12-16 stsp goto done;
6658 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6660 a615e0e7 2020-12-16 stsp goto done;
6661 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6662 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6663 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6664 a615e0e7 2020-12-16 stsp err = sync_err;
6666 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6667 a615e0e7 2020-12-16 stsp free(fileindex_path);
6668 818c7501 2019-07-11 stsp free(new_head_commit_id);
6669 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6670 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6671 818c7501 2019-07-11 stsp err = unlockerr;
6672 818c7501 2019-07-11 stsp return err;
6675 818c7501 2019-07-11 stsp const struct got_error *
6676 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6677 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6678 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6679 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6681 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6682 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6683 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6684 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6685 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6686 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6688 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6690 818c7501 2019-07-11 stsp return err;
6692 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6693 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6695 818c7501 2019-07-11 stsp goto done;
6697 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6699 818c7501 2019-07-11 stsp goto done;
6702 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6703 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6704 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6706 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6708 818c7501 2019-07-11 stsp goto done;
6710 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6712 818c7501 2019-07-11 stsp goto done;
6714 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6715 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6717 ca355955 2019-07-12 stsp goto done;
6719 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6721 ca355955 2019-07-12 stsp goto done;
6723 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6725 818c7501 2019-07-11 stsp goto done;
6727 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6728 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6729 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6730 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6731 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6732 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6733 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6734 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
6735 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6736 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
6738 1f1abb7e 2019-08-08 stsp goto sync;
6740 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6741 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6743 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6744 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6745 ca355955 2019-07-12 stsp err = sync_err;
6747 818c7501 2019-07-11 stsp got_ref_close(resolved);
6748 a3a2faf2 2019-07-12 stsp free(tree_id);
6749 818c7501 2019-07-11 stsp free(commit_id);
6750 0ebf8283 2019-07-24 stsp if (fileindex)
6751 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6752 0ebf8283 2019-07-24 stsp free(fileindex_path);
6754 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6755 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6756 0ebf8283 2019-07-24 stsp err = unlockerr;
6757 0ebf8283 2019-07-24 stsp return err;
6760 0ebf8283 2019-07-24 stsp const struct got_error *
6761 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6762 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6763 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6764 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6766 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6767 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6768 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6769 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6770 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6771 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6772 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6773 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6775 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6776 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6777 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6778 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6780 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6782 0ebf8283 2019-07-24 stsp return err;
6784 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6786 0ebf8283 2019-07-24 stsp goto done;
6788 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6789 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6790 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6793 0ebf8283 2019-07-24 stsp goto done;
6795 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6797 0ebf8283 2019-07-24 stsp goto done;
6799 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6801 0ebf8283 2019-07-24 stsp goto done;
6803 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6804 0ebf8283 2019-07-24 stsp worktree);
6806 0ebf8283 2019-07-24 stsp goto done;
6808 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6811 0ebf8283 2019-07-24 stsp goto done;
6813 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6815 0ebf8283 2019-07-24 stsp goto done;
6817 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6819 0ebf8283 2019-07-24 stsp goto done;
6821 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6822 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6824 0ebf8283 2019-07-24 stsp goto done;
6825 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6827 0ebf8283 2019-07-24 stsp goto done;
6828 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6829 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6830 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6831 0ebf8283 2019-07-24 stsp goto done;
6834 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6835 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6837 0ebf8283 2019-07-24 stsp goto done;
6838 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6840 0ebf8283 2019-07-24 stsp goto done;
6842 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6844 0ebf8283 2019-07-24 stsp goto done;
6846 0ebf8283 2019-07-24 stsp free(fileindex_path);
6847 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6848 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6849 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6850 0ebf8283 2019-07-24 stsp if (wt_branch)
6851 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6852 0ebf8283 2019-07-24 stsp if (err) {
6853 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6854 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6855 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6857 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6858 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6859 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6861 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6862 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6863 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6864 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6866 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6868 0ebf8283 2019-07-24 stsp return err;
6871 0ebf8283 2019-07-24 stsp const struct got_error *
6872 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6873 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6875 3e3a69f1 2019-07-25 stsp if (fileindex)
6876 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6877 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6880 0ebf8283 2019-07-24 stsp const struct got_error *
6881 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6882 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6884 0ebf8283 2019-07-24 stsp const struct got_error *err;
6885 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6887 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6889 0ebf8283 2019-07-24 stsp return err;
6891 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6892 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6893 0ebf8283 2019-07-24 stsp return NULL;
6896 0ebf8283 2019-07-24 stsp const struct got_error *
6897 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6898 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6899 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6900 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6902 0ebf8283 2019-07-24 stsp const struct got_error *err;
6903 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6904 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6905 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6906 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6907 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6908 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6910 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6911 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6912 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6913 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6915 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6917 3e3a69f1 2019-07-25 stsp return err;
6919 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6921 f032f1f7 2019-08-04 stsp goto done;
6923 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6924 f032f1f7 2019-08-04 stsp &have_staged_files);
6925 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6926 f032f1f7 2019-08-04 stsp goto done;
6927 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6928 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6929 3e3a69f1 2019-07-25 stsp goto done;
6932 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6934 f032f1f7 2019-08-04 stsp goto done;
6936 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6938 0ebf8283 2019-07-24 stsp goto done;
6940 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6942 0ebf8283 2019-07-24 stsp goto done;
6944 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6945 0ebf8283 2019-07-24 stsp worktree);
6947 0ebf8283 2019-07-24 stsp goto done;
6949 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6951 0ebf8283 2019-07-24 stsp goto done;
6953 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6955 0ebf8283 2019-07-24 stsp goto done;
6956 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6958 0ebf8283 2019-07-24 stsp goto done;
6960 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6962 0ebf8283 2019-07-24 stsp goto done;
6963 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6965 0ebf8283 2019-07-24 stsp goto done;
6967 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6969 0ebf8283 2019-07-24 stsp goto done;
6971 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6972 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6973 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6974 0ebf8283 2019-07-24 stsp if (commit_ref)
6975 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6976 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6977 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6978 0ebf8283 2019-07-24 stsp if (err) {
6979 0ebf8283 2019-07-24 stsp free(*commit_id);
6980 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6981 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6982 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6983 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6984 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6985 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6987 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6988 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6989 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6991 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6993 0ebf8283 2019-07-24 stsp return err;
6996 0ebf8283 2019-07-24 stsp static const struct got_error *
6997 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6999 0ebf8283 2019-07-24 stsp const struct got_error *err;
7000 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7001 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7003 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7005 0ebf8283 2019-07-24 stsp goto done;
7006 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7008 0ebf8283 2019-07-24 stsp goto done;
7010 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7011 0ebf8283 2019-07-24 stsp worktree);
7013 0ebf8283 2019-07-24 stsp goto done;
7014 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7016 0ebf8283 2019-07-24 stsp goto done;
7018 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7020 0ebf8283 2019-07-24 stsp goto done;
7021 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7023 0ebf8283 2019-07-24 stsp goto done;
7025 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7027 0ebf8283 2019-07-24 stsp goto done;
7028 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7030 0ebf8283 2019-07-24 stsp goto done;
7032 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7033 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7034 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7035 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7036 0ebf8283 2019-07-24 stsp return err;
7039 0ebf8283 2019-07-24 stsp const struct got_error *
7040 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7041 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7042 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7043 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7045 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7046 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7047 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7048 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7049 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7051 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7053 0ebf8283 2019-07-24 stsp return err;
7055 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7056 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7058 0ebf8283 2019-07-24 stsp goto done;
7060 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7062 0ebf8283 2019-07-24 stsp goto done;
7064 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7066 0ebf8283 2019-07-24 stsp goto done;
7068 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7069 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7071 0ebf8283 2019-07-24 stsp goto done;
7073 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7075 0ebf8283 2019-07-24 stsp goto done;
7077 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7079 0ebf8283 2019-07-24 stsp goto done;
7081 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7082 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7083 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7084 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7085 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7086 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7087 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7088 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
7089 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7090 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7092 1f1abb7e 2019-08-08 stsp goto sync;
7094 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7095 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7097 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7098 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7099 0ebf8283 2019-07-24 stsp err = sync_err;
7101 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7102 0ebf8283 2019-07-24 stsp free(tree_id);
7103 818c7501 2019-07-11 stsp free(fileindex_path);
7105 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7106 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7107 818c7501 2019-07-11 stsp err = unlockerr;
7108 818c7501 2019-07-11 stsp return err;
7111 0ebf8283 2019-07-24 stsp const struct got_error *
7112 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7113 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7114 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7116 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7117 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7118 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7119 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7121 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7123 0ebf8283 2019-07-24 stsp return err;
7125 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7126 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7128 e600f124 2021-03-21 stsp goto done;
7130 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7131 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7133 0ebf8283 2019-07-24 stsp goto done;
7135 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7137 0ebf8283 2019-07-24 stsp goto done;
7139 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7141 0ebf8283 2019-07-24 stsp goto done;
7143 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7145 0ebf8283 2019-07-24 stsp goto done;
7147 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7149 a615e0e7 2020-12-16 stsp goto done;
7151 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7153 a615e0e7 2020-12-16 stsp goto done;
7154 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7155 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7156 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7157 a615e0e7 2020-12-16 stsp err = sync_err;
7159 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7160 a615e0e7 2020-12-16 stsp free(fileindex_path);
7161 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7162 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7163 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7164 0ebf8283 2019-07-24 stsp err = unlockerr;
7165 0ebf8283 2019-07-24 stsp return err;
7168 0ebf8283 2019-07-24 stsp const struct got_error *
7169 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7170 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7172 0ebf8283 2019-07-24 stsp const struct got_error *err;
7173 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7175 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7177 0ebf8283 2019-07-24 stsp return err;
7179 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7181 0ebf8283 2019-07-24 stsp goto done;
7183 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7185 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7186 2822a352 2019-10-15 stsp return err;
7189 2822a352 2019-10-15 stsp const struct got_error *
7190 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7191 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7192 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7193 2822a352 2019-10-15 stsp struct got_repository *repo)
7195 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7196 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7197 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7199 2822a352 2019-10-15 stsp *fileindex = NULL;
7200 2822a352 2019-10-15 stsp *branch_ref = NULL;
7201 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7203 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7205 2822a352 2019-10-15 stsp return err;
7207 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7208 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7209 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7210 2822a352 2019-10-15 stsp "update -b or different branch name required");
7211 2822a352 2019-10-15 stsp goto done;
7214 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7216 2822a352 2019-10-15 stsp goto done;
7218 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7219 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7220 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7221 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7224 2822a352 2019-10-15 stsp goto done;
7226 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7228 2822a352 2019-10-15 stsp goto done;
7230 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7231 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7233 2822a352 2019-10-15 stsp if (err) {
7234 2822a352 2019-10-15 stsp if (*branch_ref) {
7235 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7236 2822a352 2019-10-15 stsp *branch_ref = NULL;
7238 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7239 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7240 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7242 2822a352 2019-10-15 stsp if (*fileindex) {
7243 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7244 2822a352 2019-10-15 stsp *fileindex = NULL;
7246 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7248 0cb83759 2019-08-03 stsp return err;
7251 2822a352 2019-10-15 stsp const struct got_error *
7252 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7253 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7254 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7255 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7256 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7258 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7259 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7260 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7262 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7264 2822a352 2019-10-15 stsp goto done;
7266 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7268 2822a352 2019-10-15 stsp goto done;
7270 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7271 2822a352 2019-10-15 stsp worktree->path_prefix);
7273 2822a352 2019-10-15 stsp goto done;
7275 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7277 2822a352 2019-10-15 stsp goto done;
7279 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7280 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7282 2822a352 2019-10-15 stsp goto sync;
7284 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7286 2822a352 2019-10-15 stsp goto sync;
7288 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7290 6e210706 2021-01-22 stsp goto sync;
7292 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7294 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7295 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7296 2822a352 2019-10-15 stsp err = sync_err;
7299 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7300 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7301 2822a352 2019-10-15 stsp err = unlockerr;
7302 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7304 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7305 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7306 2822a352 2019-10-15 stsp err = unlockerr;
7307 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7309 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7310 2822a352 2019-10-15 stsp free(fileindex_path);
7311 2822a352 2019-10-15 stsp free(tree_id);
7313 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7314 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7315 2822a352 2019-10-15 stsp err = unlockerr;
7316 2822a352 2019-10-15 stsp return err;
7319 2822a352 2019-10-15 stsp const struct got_error *
7320 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7321 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7322 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7324 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7326 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7328 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7330 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7331 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7332 8b692cd0 2019-10-21 stsp err = unlockerr;
7333 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7335 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7336 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7337 8b692cd0 2019-10-21 stsp err = unlockerr;
7338 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7340 10604dce 2021-09-24 thomas return err;
7343 10604dce 2021-09-24 thomas const struct got_error *
7344 10604dce 2021-09-24 thomas got_worktree_merge_postpone(struct got_worktree *worktree,
7345 10604dce 2021-09-24 thomas struct got_fileindex *fileindex)
7347 10604dce 2021-09-24 thomas const struct got_error *err, *sync_err;
7348 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7350 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7351 10604dce 2021-09-24 thomas if (err)
7352 10604dce 2021-09-24 thomas goto done;
7354 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7356 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_SH);
7357 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7358 10604dce 2021-09-24 thomas err = sync_err;
7360 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7361 10604dce 2021-09-24 thomas free(fileindex_path);
7362 8b692cd0 2019-10-21 stsp return err;
7365 10604dce 2021-09-24 thomas static const struct got_error *
7366 10604dce 2021-09-24 thomas delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7368 10604dce 2021-09-24 thomas const struct got_error *err;
7369 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7371 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7372 10604dce 2021-09-24 thomas if (err)
7373 10604dce 2021-09-24 thomas goto done;
7374 10604dce 2021-09-24 thomas err = delete_ref(branch_refname, repo);
7375 10604dce 2021-09-24 thomas if (err)
7376 10604dce 2021-09-24 thomas goto done;
7378 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7379 10604dce 2021-09-24 thomas if (err)
7380 10604dce 2021-09-24 thomas goto done;
7381 10604dce 2021-09-24 thomas err = delete_ref(commit_refname, repo);
7382 10604dce 2021-09-24 thomas if (err)
7383 10604dce 2021-09-24 thomas goto done;
7386 10604dce 2021-09-24 thomas free(branch_refname);
7387 10604dce 2021-09-24 thomas free(commit_refname);
7388 10604dce 2021-09-24 thomas return err;
7391 10604dce 2021-09-24 thomas struct merge_commit_msg_arg {
7392 10604dce 2021-09-24 thomas struct got_worktree *worktree;
7393 10604dce 2021-09-24 thomas const char *branch_name;
7396 10604dce 2021-09-24 thomas static const struct got_error *
7397 10604dce 2021-09-24 thomas merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7398 10604dce 2021-09-24 thomas void *arg)
7400 10604dce 2021-09-24 thomas struct merge_commit_msg_arg *a = arg;
7402 10604dce 2021-09-24 thomas if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7403 10604dce 2021-09-24 thomas got_worktree_get_head_ref_name(a->worktree)) == -1)
7404 10604dce 2021-09-24 thomas return got_error_from_errno("asprintf");
7406 10604dce 2021-09-24 thomas return NULL;
7410 10604dce 2021-09-24 thomas const struct got_error *
7411 10604dce 2021-09-24 thomas got_worktree_merge_branch(struct got_worktree *worktree,
7412 10604dce 2021-09-24 thomas struct got_fileindex *fileindex,
7413 10604dce 2021-09-24 thomas struct got_object_id *yca_commit_id,
7414 10604dce 2021-09-24 thomas struct got_object_id *branch_tip,
7415 10604dce 2021-09-24 thomas struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7416 10604dce 2021-09-24 thomas void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7418 10604dce 2021-09-24 thomas const struct got_error *err;
7419 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7421 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7422 10604dce 2021-09-24 thomas if (err)
7423 10604dce 2021-09-24 thomas goto done;
7425 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7426 10604dce 2021-09-24 thomas worktree);
7427 10604dce 2021-09-24 thomas if (err)
7428 10604dce 2021-09-24 thomas goto done;
7430 10604dce 2021-09-24 thomas err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7431 10604dce 2021-09-24 thomas branch_tip, repo, progress_cb, progress_arg,
7432 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
7434 10604dce 2021-09-24 thomas free(fileindex_path);
7435 10604dce 2021-09-24 thomas return err;
7438 10604dce 2021-09-24 thomas const struct got_error *
7439 10604dce 2021-09-24 thomas got_worktree_merge_commit(struct got_object_id **new_commit_id,
7440 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
7441 10604dce 2021-09-24 thomas const char *author, const char *committer, int allow_bad_symlinks,
7442 10604dce 2021-09-24 thomas struct got_object_id *branch_tip, const char *branch_name,
7443 ae1e948a 2021-09-28 thomas struct got_repository *repo,
7444 ae1e948a 2021-09-28 thomas got_worktree_status_cb status_cb, void *status_arg)
7447 10604dce 2021-09-24 thomas const struct got_error *err = NULL, *sync_err;
7448 10604dce 2021-09-24 thomas struct got_pathlist_head commitable_paths;
7449 10604dce 2021-09-24 thomas struct collect_commitables_arg cc_arg;
7450 10604dce 2021-09-24 thomas struct got_pathlist_entry *pe;
7451 10604dce 2021-09-24 thomas struct got_reference *head_ref = NULL;
7452 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id = NULL;
7453 10604dce 2021-09-24 thomas int have_staged_files = 0;
7454 10604dce 2021-09-24 thomas struct merge_commit_msg_arg mcm_arg;
7455 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7457 10604dce 2021-09-24 thomas *new_commit_id = NULL;
7459 10604dce 2021-09-24 thomas TAILQ_INIT(&commitable_paths);
7461 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7462 10604dce 2021-09-24 thomas if (err)
7463 10604dce 2021-09-24 thomas goto done;
7465 10604dce 2021-09-24 thomas err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7466 10604dce 2021-09-24 thomas if (err)
7467 10604dce 2021-09-24 thomas goto done;
7469 10604dce 2021-09-24 thomas err = got_ref_resolve(&head_commit_id, repo, head_ref);
7470 10604dce 2021-09-24 thomas if (err)
7471 10604dce 2021-09-24 thomas goto done;
7473 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7474 10604dce 2021-09-24 thomas &have_staged_files);
7475 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7476 10604dce 2021-09-24 thomas goto done;
7477 10604dce 2021-09-24 thomas if (have_staged_files) {
7478 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7479 10604dce 2021-09-24 thomas goto done;
7482 10604dce 2021-09-24 thomas cc_arg.commitable_paths = &commitable_paths;
7483 10604dce 2021-09-24 thomas cc_arg.worktree = worktree;
7484 10604dce 2021-09-24 thomas cc_arg.fileindex = fileindex;
7485 10604dce 2021-09-24 thomas cc_arg.repo = repo;
7486 10604dce 2021-09-24 thomas cc_arg.have_staged_files = have_staged_files;
7487 10604dce 2021-09-24 thomas cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7488 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7489 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7490 10604dce 2021-09-24 thomas if (err)
7491 10604dce 2021-09-24 thomas goto done;
7493 10604dce 2021-09-24 thomas if (TAILQ_EMPTY(&commitable_paths)) {
7494 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7495 10604dce 2021-09-24 thomas "merge of %s cannot proceed", branch_name);
7496 10604dce 2021-09-24 thomas goto done;
7499 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7500 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7501 10604dce 2021-09-24 thomas const char *ct_path = ct->in_repo_path;
7503 10604dce 2021-09-24 thomas while (ct_path[0] == '/')
7504 10604dce 2021-09-24 thomas ct_path++;
7505 10604dce 2021-09-24 thomas err = check_out_of_date(ct_path, ct->status,
7506 10604dce 2021-09-24 thomas ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7507 10604dce 2021-09-24 thomas head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7508 10604dce 2021-09-24 thomas if (err)
7509 10604dce 2021-09-24 thomas goto done;
7513 10604dce 2021-09-24 thomas mcm_arg.worktree = worktree;
7514 10604dce 2021-09-24 thomas mcm_arg.branch_name = branch_name;
7515 10604dce 2021-09-24 thomas err = commit_worktree(new_commit_id, &commitable_paths,
7516 10604dce 2021-09-24 thomas head_commit_id, branch_tip, worktree, author, committer,
7517 ae1e948a 2021-09-28 thomas merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7518 10604dce 2021-09-24 thomas if (err)
7519 10604dce 2021-09-24 thomas goto done;
7521 10604dce 2021-09-24 thomas err = update_fileindex_after_commit(worktree, &commitable_paths,
7522 10604dce 2021-09-24 thomas *new_commit_id, fileindex, have_staged_files);
7523 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7524 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7525 10604dce 2021-09-24 thomas err = sync_err;
7527 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7528 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7529 10604dce 2021-09-24 thomas free_commitable(ct);
7531 10604dce 2021-09-24 thomas got_pathlist_free(&commitable_paths);
7532 10604dce 2021-09-24 thomas free(fileindex_path);
7533 10604dce 2021-09-24 thomas return err;
7536 10604dce 2021-09-24 thomas const struct got_error *
7537 10604dce 2021-09-24 thomas got_worktree_merge_complete(struct got_worktree *worktree,
7538 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo)
7540 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7541 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7543 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7544 10604dce 2021-09-24 thomas if (err)
7545 10604dce 2021-09-24 thomas goto done;
7547 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7548 10604dce 2021-09-24 thomas if (err)
7549 10604dce 2021-09-24 thomas goto done;
7550 10604dce 2021-09-24 thomas err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7551 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7552 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7553 10604dce 2021-09-24 thomas err = sync_err;
7555 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7556 10604dce 2021-09-24 thomas free(fileindex_path);
7557 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7558 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7559 10604dce 2021-09-24 thomas err = unlockerr;
7560 10604dce 2021-09-24 thomas return err;
7563 10604dce 2021-09-24 thomas const struct got_error *
7564 10604dce 2021-09-24 thomas got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7565 10604dce 2021-09-24 thomas struct got_repository *repo)
7567 10604dce 2021-09-24 thomas const struct got_error *err;
7568 10604dce 2021-09-24 thomas char *branch_refname = NULL;
7569 10604dce 2021-09-24 thomas struct got_reference *branch_ref = NULL;
7571 10604dce 2021-09-24 thomas *in_progress = 0;
7573 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7574 10604dce 2021-09-24 thomas if (err)
7575 10604dce 2021-09-24 thomas return err;
7576 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7577 dfe86d1f 2021-09-24 thomas free(branch_refname);
7578 10604dce 2021-09-24 thomas if (err) {
7579 10604dce 2021-09-24 thomas if (err->code != GOT_ERR_NOT_REF)
7580 10604dce 2021-09-24 thomas return err;
7582 10604dce 2021-09-24 thomas *in_progress = 1;
7584 10604dce 2021-09-24 thomas return NULL;
7587 10604dce 2021-09-24 thomas const struct got_error *got_worktree_merge_prepare(
7588 10604dce 2021-09-24 thomas struct got_fileindex **fileindex, struct got_worktree *worktree,
7589 10604dce 2021-09-24 thomas struct got_reference *branch, struct got_repository *repo)
7591 10604dce 2021-09-24 thomas const struct got_error *err = NULL;
7592 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7593 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7594 10604dce 2021-09-24 thomas struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7595 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL;
7596 10604dce 2021-09-24 thomas struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7597 10604dce 2021-09-24 thomas struct check_rebase_ok_arg ok_arg;
7599 10604dce 2021-09-24 thomas *fileindex = NULL;
7601 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
7602 10604dce 2021-09-24 thomas if (err)
7603 10604dce 2021-09-24 thomas return err;
7605 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
7606 10604dce 2021-09-24 thomas if (err)
7607 10604dce 2021-09-24 thomas goto done;
7609 10604dce 2021-09-24 thomas /* Preconditions are the same as for rebase. */
7610 10604dce 2021-09-24 thomas ok_arg.worktree = worktree;
7611 10604dce 2021-09-24 thomas ok_arg.repo = repo;
7612 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7613 10604dce 2021-09-24 thomas &ok_arg);
7614 10604dce 2021-09-24 thomas if (err)
7615 10604dce 2021-09-24 thomas goto done;
7617 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7618 10604dce 2021-09-24 thomas if (err)
7619 10604dce 2021-09-24 thomas return err;
7621 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7622 10604dce 2021-09-24 thomas if (err)
7623 10604dce 2021-09-24 thomas return err;
7625 10604dce 2021-09-24 thomas err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7627 10604dce 2021-09-24 thomas if (err)
7628 10604dce 2021-09-24 thomas goto done;
7630 10604dce 2021-09-24 thomas err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7631 10604dce 2021-09-24 thomas if (err)
7632 10604dce 2021-09-24 thomas goto done;
7634 10604dce 2021-09-24 thomas if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7635 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7636 10604dce 2021-09-24 thomas goto done;
7639 10604dce 2021-09-24 thomas err = got_ref_resolve(&branch_tip, repo, branch);
7640 10604dce 2021-09-24 thomas if (err)
7641 10604dce 2021-09-24 thomas goto done;
7643 10604dce 2021-09-24 thomas err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7644 10604dce 2021-09-24 thomas if (err)
7645 10604dce 2021-09-24 thomas goto done;
7646 10604dce 2021-09-24 thomas err = got_ref_write(branch_ref, repo);
7647 10604dce 2021-09-24 thomas if (err)
7648 10604dce 2021-09-24 thomas goto done;
7650 10604dce 2021-09-24 thomas err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7651 10604dce 2021-09-24 thomas if (err)
7652 10604dce 2021-09-24 thomas goto done;
7653 10604dce 2021-09-24 thomas err = got_ref_write(commit_ref, repo);
7654 10604dce 2021-09-24 thomas if (err)
7655 10604dce 2021-09-24 thomas goto done;
7658 10604dce 2021-09-24 thomas free(branch_refname);
7659 10604dce 2021-09-24 thomas free(commit_refname);
7660 10604dce 2021-09-24 thomas free(fileindex_path);
7661 10604dce 2021-09-24 thomas if (branch_ref)
7662 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
7663 10604dce 2021-09-24 thomas if (commit_ref)
7664 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
7665 10604dce 2021-09-24 thomas if (wt_branch)
7666 10604dce 2021-09-24 thomas got_ref_close(wt_branch);
7667 10604dce 2021-09-24 thomas free(wt_branch_tip);
7668 10604dce 2021-09-24 thomas if (err) {
7669 10604dce 2021-09-24 thomas if (*fileindex) {
7670 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
7671 10604dce 2021-09-24 thomas *fileindex = NULL;
7673 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
7675 10604dce 2021-09-24 thomas return err;
7678 10604dce 2021-09-24 thomas const struct got_error *
7679 10604dce 2021-09-24 thomas got_worktree_merge_continue(char **branch_name,
7680 10604dce 2021-09-24 thomas struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7681 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_repository *repo)
7683 10604dce 2021-09-24 thomas const struct got_error *err;
7684 10604dce 2021-09-24 thomas char *commit_refname = NULL, *branch_refname = NULL;
7685 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7686 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7687 10604dce 2021-09-24 thomas int have_staged_files = 0;
7689 10604dce 2021-09-24 thomas *branch_name = NULL;
7690 10604dce 2021-09-24 thomas *branch_tip = NULL;
7691 10604dce 2021-09-24 thomas *fileindex = NULL;
7693 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
7694 10604dce 2021-09-24 thomas if (err)
7695 10604dce 2021-09-24 thomas return err;
7697 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
7698 10604dce 2021-09-24 thomas if (err)
7699 10604dce 2021-09-24 thomas goto done;
7701 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7702 10604dce 2021-09-24 thomas &have_staged_files);
7703 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7704 10604dce 2021-09-24 thomas goto done;
7705 10604dce 2021-09-24 thomas if (have_staged_files) {
7706 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_STAGED_PATHS);
7707 10604dce 2021-09-24 thomas goto done;
7710 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7711 10604dce 2021-09-24 thomas if (err)
7712 10604dce 2021-09-24 thomas goto done;
7714 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7715 10604dce 2021-09-24 thomas if (err)
7716 10604dce 2021-09-24 thomas goto done;
7718 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7719 10604dce 2021-09-24 thomas if (err)
7720 10604dce 2021-09-24 thomas goto done;
7722 10604dce 2021-09-24 thomas if (!got_ref_is_symbolic(branch_ref)) {
7723 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7724 10604dce 2021-09-24 thomas "%s is not a symbolic reference",
7725 10604dce 2021-09-24 thomas got_ref_get_name(branch_ref));
7726 10604dce 2021-09-24 thomas goto done;
7728 10604dce 2021-09-24 thomas *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7729 10604dce 2021-09-24 thomas if (*branch_name == NULL) {
7730 10604dce 2021-09-24 thomas err = got_error_from_errno("strdup");
7731 10604dce 2021-09-24 thomas goto done;
7734 10604dce 2021-09-24 thomas err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7735 10604dce 2021-09-24 thomas if (err)
7736 10604dce 2021-09-24 thomas goto done;
7738 10604dce 2021-09-24 thomas err = got_ref_resolve(branch_tip, repo, commit_ref);
7739 10604dce 2021-09-24 thomas if (err)
7740 10604dce 2021-09-24 thomas goto done;
7742 10604dce 2021-09-24 thomas free(commit_refname);
7743 10604dce 2021-09-24 thomas free(branch_refname);
7744 10604dce 2021-09-24 thomas free(fileindex_path);
7745 10604dce 2021-09-24 thomas if (commit_ref)
7746 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
7747 10604dce 2021-09-24 thomas if (branch_ref)
7748 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
7749 10604dce 2021-09-24 thomas if (err) {
7750 10604dce 2021-09-24 thomas if (*branch_name) {
7751 10604dce 2021-09-24 thomas free(*branch_name);
7752 10604dce 2021-09-24 thomas *branch_name = NULL;
7754 10604dce 2021-09-24 thomas free(*branch_tip);
7755 10604dce 2021-09-24 thomas *branch_tip = NULL;
7756 10604dce 2021-09-24 thomas if (*fileindex) {
7757 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
7758 10604dce 2021-09-24 thomas *fileindex = NULL;
7760 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
7762 10604dce 2021-09-24 thomas return err;
7765 10604dce 2021-09-24 thomas const struct got_error *
7766 10604dce 2021-09-24 thomas got_worktree_merge_abort(struct got_worktree *worktree,
7767 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo,
7768 10604dce 2021-09-24 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
7770 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7771 10604dce 2021-09-24 thomas struct got_object_id *commit_id = NULL;
7772 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7773 10604dce 2021-09-24 thomas struct revert_file_args rfa;
7774 10604dce 2021-09-24 thomas struct got_object_id *tree_id = NULL;
7776 10604dce 2021-09-24 thomas err = got_object_id_by_path(&tree_id, repo,
7777 10604dce 2021-09-24 thomas worktree->base_commit_id, worktree->path_prefix);
7778 10604dce 2021-09-24 thomas if (err)
7779 10604dce 2021-09-24 thomas goto done;
7781 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7782 10604dce 2021-09-24 thomas if (err)
7783 10604dce 2021-09-24 thomas goto done;
7785 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7786 10604dce 2021-09-24 thomas if (err)
7787 10604dce 2021-09-24 thomas goto done;
7789 10604dce 2021-09-24 thomas rfa.worktree = worktree;
7790 10604dce 2021-09-24 thomas rfa.fileindex = fileindex;
7791 10604dce 2021-09-24 thomas rfa.progress_cb = progress_cb;
7792 10604dce 2021-09-24 thomas rfa.progress_arg = progress_arg;
7793 10604dce 2021-09-24 thomas rfa.patch_cb = NULL;
7794 10604dce 2021-09-24 thomas rfa.patch_arg = NULL;
7795 10604dce 2021-09-24 thomas rfa.repo = repo;
7796 10604dce 2021-09-24 thomas rfa.unlink_added_files = 1;
7797 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7798 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7799 10604dce 2021-09-24 thomas if (err)
7800 10604dce 2021-09-24 thomas goto sync;
7802 10604dce 2021-09-24 thomas err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7803 10604dce 2021-09-24 thomas repo, progress_cb, progress_arg, NULL, NULL);
7805 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7806 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7807 10604dce 2021-09-24 thomas err = sync_err;
7809 10604dce 2021-09-24 thomas free(tree_id);
7810 10604dce 2021-09-24 thomas free(commit_id);
7811 10604dce 2021-09-24 thomas if (fileindex)
7812 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7813 10604dce 2021-09-24 thomas free(fileindex_path);
7815 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7816 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7817 10604dce 2021-09-24 thomas err = unlockerr;
7818 10604dce 2021-09-24 thomas return err;
7821 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7822 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7823 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7824 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7825 2db2652d 2019-08-07 stsp struct got_repository *repo;
7826 2db2652d 2019-08-07 stsp int have_changes;
7829 2db2652d 2019-08-07 stsp const struct got_error *
7830 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7831 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7832 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7833 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7835 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7836 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7837 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7838 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7839 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7840 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7842 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7843 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7844 8b13ce36 2019-08-08 stsp return NULL;
7845 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7846 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7848 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7849 735ef5ac 2019-08-03 stsp if (ie == NULL)
7850 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7852 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7853 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7854 735ef5ac 2019-08-03 stsp relpath) == -1)
7855 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7857 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7858 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7859 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7860 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7863 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7864 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7865 3aa5969e 2019-08-06 stsp goto done;
7866 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7867 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7868 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7869 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7870 735ef5ac 2019-08-03 stsp goto done;
7873 2db2652d 2019-08-07 stsp a->have_changes = 1;
7875 735ef5ac 2019-08-03 stsp p = in_repo_path;
7876 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7878 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7879 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7880 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7882 735ef5ac 2019-08-03 stsp free(in_repo_path);
7883 dc424a06 2019-08-07 stsp return err;
7886 2db2652d 2019-08-07 stsp struct stage_path_arg {
7887 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7888 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7889 2db2652d 2019-08-07 stsp struct got_repository *repo;
7890 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7891 2db2652d 2019-08-07 stsp void *status_arg;
7892 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7893 2db2652d 2019-08-07 stsp void *patch_arg;
7894 7b5dc508 2019-10-28 stsp int staged_something;
7895 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7898 2db2652d 2019-08-07 stsp static const struct got_error *
7899 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7900 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7901 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7902 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7904 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7905 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7906 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7907 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7908 0cb83759 2019-08-03 stsp uint32_t stage;
7909 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7910 0aeb8099 2020-07-23 stsp struct stat sb;
7912 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7913 8b13ce36 2019-08-08 stsp return NULL;
7915 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7916 d3e7c587 2019-08-03 stsp if (ie == NULL)
7917 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7919 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7920 2db2652d 2019-08-07 stsp relpath)== -1)
7921 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7923 0cb83759 2019-08-03 stsp switch (status) {
7924 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7925 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7926 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7927 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7928 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7931 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7932 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7933 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7934 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7935 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7938 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7941 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7942 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7943 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7944 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7945 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7949 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7950 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7953 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7954 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7955 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7956 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7958 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7959 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7960 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7961 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7962 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7963 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7964 35213c7c 2020-07-23 stsp ssize_t target_len;
7965 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7966 35213c7c 2020-07-23 stsp sizeof(target_path));
7967 35213c7c 2020-07-23 stsp if (target_len == -1) {
7968 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7969 35213c7c 2020-07-23 stsp ondisk_path);
7972 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7973 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7974 35213c7c 2020-07-23 stsp a->worktree->root_path);
7977 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7978 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7979 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7983 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7984 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7985 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7987 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7988 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7990 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7991 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7993 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7994 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7996 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7997 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7998 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8000 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8001 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8003 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8004 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8005 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8006 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8009 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8011 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8012 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8016 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8017 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8018 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8019 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8021 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8022 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8025 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8027 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8028 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8030 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8031 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8034 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8038 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8039 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8040 dc424a06 2019-08-07 stsp free(path_content);
8041 2db2652d 2019-08-07 stsp free(ondisk_path);
8042 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8043 0ebf8283 2019-07-24 stsp return err;
8046 0cb83759 2019-08-03 stsp const struct got_error *
8047 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8048 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8049 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8050 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8051 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8053 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8054 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8055 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8056 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8057 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8058 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8059 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8060 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8062 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8064 0cb83759 2019-08-03 stsp return err;
8066 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8067 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8069 735ef5ac 2019-08-03 stsp goto done;
8070 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8072 735ef5ac 2019-08-03 stsp goto done;
8073 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8075 0cb83759 2019-08-03 stsp goto done;
8077 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8078 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8079 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8080 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8081 2db2652d 2019-08-07 stsp oka.repo = repo;
8082 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8083 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8084 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8085 6092c299 2021-10-04 thomas check_stage_ok, &oka, NULL, NULL, 1, 0);
8087 735ef5ac 2019-08-03 stsp goto done;
8089 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8090 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8091 2db2652d 2019-08-07 stsp goto done;
8094 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8095 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8096 2db2652d 2019-08-07 stsp spa.repo = repo;
8097 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8098 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8099 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8100 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8101 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8102 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8103 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8104 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8105 6092c299 2021-10-04 thomas stage_path, &spa, NULL, NULL, 1, 0);
8107 2db2652d 2019-08-07 stsp goto done;
8109 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8110 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8111 7b5dc508 2019-10-28 stsp goto done;
8114 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8115 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8116 0cb83759 2019-08-03 stsp err = sync_err;
8118 735ef5ac 2019-08-03 stsp if (head_ref)
8119 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8120 735ef5ac 2019-08-03 stsp free(head_commit_id);
8121 0cb83759 2019-08-03 stsp free(fileindex_path);
8122 0cb83759 2019-08-03 stsp if (fileindex)
8123 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8124 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8125 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8126 0cb83759 2019-08-03 stsp err = unlockerr;
8127 0cb83759 2019-08-03 stsp return err;
8130 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8131 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8132 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8133 ad493afc 2019-08-03 stsp struct got_repository *repo;
8134 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8135 ad493afc 2019-08-03 stsp void *progress_arg;
8136 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8137 2e1f37b0 2019-08-08 stsp void *patch_arg;
8140 2e1f37b0 2019-08-08 stsp static const struct got_error *
8141 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8142 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8143 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8144 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8145 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8147 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8148 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8149 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8150 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8151 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8152 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8153 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8155 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8156 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8158 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8160 2e1f37b0 2019-08-08 stsp return err;
8161 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8163 2e1f37b0 2019-08-08 stsp goto done;
8165 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8167 2e1f37b0 2019-08-08 stsp goto done;
8169 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8171 2e1f37b0 2019-08-08 stsp goto done;
8173 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8175 2e1f37b0 2019-08-08 stsp goto done;
8177 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8179 2e1f37b0 2019-08-08 stsp goto done;
8181 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8183 2e1f37b0 2019-08-08 stsp goto done;
8185 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8186 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8188 2e1f37b0 2019-08-08 stsp goto done;
8190 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8191 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8193 2e1f37b0 2019-08-08 stsp goto done;
8194 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8195 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8197 2e1f37b0 2019-08-08 stsp goto done;
8199 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8200 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8201 2e1f37b0 2019-08-08 stsp goto done;
8203 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8204 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8205 2e1f37b0 2019-08-08 stsp goto done;
8207 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8208 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8209 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
8210 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8211 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8212 fe621944 2020-11-10 stsp nchanges++;
8214 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8215 2e1f37b0 2019-08-08 stsp int choice;
8216 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8217 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8218 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8219 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8221 2e1f37b0 2019-08-08 stsp goto done;
8222 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8223 2e1f37b0 2019-08-08 stsp have_content = 1;
8225 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8226 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8229 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8230 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8231 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8233 2e1f37b0 2019-08-08 stsp free(label1);
8235 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8236 2e1f37b0 2019-08-08 stsp if (staged_blob)
8237 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8238 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8239 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8240 fe621944 2020-11-10 stsp err = free_err;
8241 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8242 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8243 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8244 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8245 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8246 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8247 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8248 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8249 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8250 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8251 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8252 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8253 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8254 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8255 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8256 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8257 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8258 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8259 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8261 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8262 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8263 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8264 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8265 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8266 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8267 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8269 2e1f37b0 2019-08-08 stsp free(path1);
8270 2e1f37b0 2019-08-08 stsp free(path2);
8271 fda8017d 2020-07-23 stsp return err;
8274 fda8017d 2020-07-23 stsp static const struct got_error *
8275 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8276 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8277 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8278 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8279 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8280 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8281 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8283 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8284 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8285 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8286 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8287 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8288 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8289 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8290 fda8017d 2020-07-23 stsp struct stat sb;
8292 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8293 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8294 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8296 fda8017d 2020-07-23 stsp return err;
8298 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8299 fda8017d 2020-07-23 stsp return NULL;
8301 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8302 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8303 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8305 fda8017d 2020-07-23 stsp goto done;
8308 c56c5d8a 2021-12-31 thomas f = fopen(path_unstaged_content, "re");
8309 fda8017d 2020-07-23 stsp if (f == NULL) {
8310 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8311 fda8017d 2020-07-23 stsp path_unstaged_content);
8312 fda8017d 2020-07-23 stsp goto done;
8314 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8315 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8316 fda8017d 2020-07-23 stsp goto done;
8318 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8319 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8320 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8322 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8323 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8324 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8325 fda8017d 2020-07-23 stsp goto done;
8327 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8328 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8329 fda8017d 2020-07-23 stsp goto done;
8331 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8332 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8333 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8334 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8335 fda8017d 2020-07-23 stsp progress_arg);
8337 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8339 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8341 67a66647 2021-05-31 stsp return err;
8343 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8344 67a66647 2021-05-31 stsp parent) == -1) {
8345 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8346 67a66647 2021-05-31 stsp base_path = NULL;
8347 67a66647 2021-05-31 stsp goto done;
8350 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8352 67a66647 2021-05-31 stsp goto done;
8353 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8354 67a66647 2021-05-31 stsp blob_base);
8356 67a66647 2021-05-31 stsp goto done;
8359 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8360 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8362 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8363 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8364 eec2f5a9 2021-06-03 stsp ondisk_path);
8366 eec2f5a9 2021-06-03 stsp goto done;
8369 06340621 2021-12-31 thomas fd = open(ondisk_path,
8370 06340621 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8371 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8372 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8373 eec2f5a9 2021-06-03 stsp goto done;
8375 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8376 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8377 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8378 eec2f5a9 2021-06-03 stsp close(fd);
8379 eec2f5a9 2021-06-03 stsp goto done;
8383 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8384 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8385 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8386 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8387 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8390 fda8017d 2020-07-23 stsp goto done;
8392 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8393 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8394 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8396 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8397 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8400 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8401 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8402 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8403 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8404 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8405 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8406 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8407 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8408 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8409 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8410 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8411 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8412 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8413 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8414 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8415 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8416 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8417 67a66647 2021-05-31 stsp free(blob_base_path);
8418 67a66647 2021-05-31 stsp free(parent);
8419 67a66647 2021-05-31 stsp free(base_path);
8420 2e1f37b0 2019-08-08 stsp return err;
8423 ad493afc 2019-08-03 stsp static const struct got_error *
8424 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8425 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8426 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8427 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8429 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8430 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8431 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8432 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8433 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8434 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8435 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8436 9bc94a15 2019-08-03 stsp struct stat sb;
8438 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8439 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8440 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8441 2e1f37b0 2019-08-08 stsp return NULL;
8443 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8444 ad493afc 2019-08-03 stsp if (ie == NULL)
8445 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8447 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8449 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8451 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8452 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8454 f69721c3 2019-10-21 stsp goto done;
8455 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8456 f69721c3 2019-10-21 stsp id_str) == -1) {
8457 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8458 f69721c3 2019-10-21 stsp goto done;
8461 ad493afc 2019-08-03 stsp switch (staged_status) {
8462 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8463 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8464 ad493afc 2019-08-03 stsp blob_id, 8192);
8467 ad493afc 2019-08-03 stsp /* fall through */
8468 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8469 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8470 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8471 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8472 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8473 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8476 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8479 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8480 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8481 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8482 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8483 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8484 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8487 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8488 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8491 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8492 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8493 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8494 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8495 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8496 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8497 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8498 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8499 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8501 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8502 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8503 36bf999c 2020-07-23 stsp char *staged_target;
8504 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8505 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8507 36bf999c 2020-07-23 stsp goto done;
8508 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8509 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8510 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8511 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8512 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8513 36bf999c 2020-07-23 stsp free(staged_target);
8515 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8516 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8517 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8518 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8519 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8520 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8521 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8525 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8528 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8529 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8530 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8531 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8534 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8535 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8536 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8537 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8538 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8541 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8543 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8544 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8548 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8549 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8550 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8551 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8554 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8558 ad493afc 2019-08-03 stsp free(ondisk_path);
8559 ad493afc 2019-08-03 stsp if (blob_base)
8560 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8561 ad493afc 2019-08-03 stsp if (blob_staged)
8562 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8563 f69721c3 2019-10-21 stsp free(id_str);
8564 f69721c3 2019-10-21 stsp free(label_orig);
8565 ad493afc 2019-08-03 stsp return err;
8568 ad493afc 2019-08-03 stsp const struct got_error *
8569 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8570 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8571 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8572 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8573 ad493afc 2019-08-03 stsp struct got_repository *repo)
8575 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8576 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8577 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8578 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8579 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8581 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8583 ad493afc 2019-08-03 stsp return err;
8585 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8587 ad493afc 2019-08-03 stsp goto done;
8589 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8590 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8591 ad493afc 2019-08-03 stsp upa.repo = repo;
8592 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8593 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8594 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8595 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8596 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8597 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8598 6092c299 2021-10-04 thomas unstage_path, &upa, NULL, NULL, 1, 0);
8600 ad493afc 2019-08-03 stsp goto done;
8603 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8604 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8605 ad493afc 2019-08-03 stsp err = sync_err;
8607 ad493afc 2019-08-03 stsp free(fileindex_path);
8608 ad493afc 2019-08-03 stsp if (fileindex)
8609 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8610 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8611 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8612 ad493afc 2019-08-03 stsp err = unlockerr;
8613 ad493afc 2019-08-03 stsp return err;
8616 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8617 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8618 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8619 b2118c49 2020-07-28 stsp void *info_arg;
8620 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8621 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8622 b2118c49 2020-07-28 stsp void *cancel_arg;
8625 b2118c49 2020-07-28 stsp static const struct got_error *
8626 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8628 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8629 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8630 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8631 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8632 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8633 b2118c49 2020-07-28 stsp int stage;
8635 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8636 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8638 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8639 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8640 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8643 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8644 b2118c49 2020-07-28 stsp return NULL;
8646 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8647 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8648 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8650 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8651 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8652 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8653 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8654 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8655 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8658 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8659 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8660 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8663 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8664 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8667 b2118c49 2020-07-28 stsp const struct got_error *
8668 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8669 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8670 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8671 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8674 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8675 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8676 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8677 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8679 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8681 b2118c49 2020-07-28 stsp return err;
8683 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8685 b2118c49 2020-07-28 stsp goto done;
8687 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8688 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8689 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8690 b2118c49 2020-07-28 stsp arg.paths = paths;
8691 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8692 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8693 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8696 b2118c49 2020-07-28 stsp free(fileindex_path);
8697 b2118c49 2020-07-28 stsp if (fileindex)
8698 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8699 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8700 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8701 b2118c49 2020-07-28 stsp err = unlockerr;
8702 b2118c49 2020-07-28 stsp return err;
