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>
33 dd038bc6 2021-09-21 thomas.ad #include "got_compat.h"
35 86c3caaf 2018-03-09 stsp #include "got_error.h"
36 86c3caaf 2018-03-09 stsp #include "got_repository.h"
37 5261c201 2018-04-01 stsp #include "got_reference.h"
38 9d31a1d8 2018-03-11 stsp #include "got_object.h"
39 1dd54920 2019-05-11 stsp #include "got_path.h"
40 e6209546 2019-08-22 stsp #include "got_cancel.h"
41 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
42 511a516b 2018-05-19 stsp #include "got_opentemp.h"
43 234035bc 2019-06-01 stsp #include "got_diff.h"
45 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
48 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
51 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
52 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
53 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
54 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
55 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
58 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
62 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
64 99724ed4 2018-03-10 stsp static const struct got_error *
65 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
67 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
70 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
71 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
73 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
78 507dc3bb 2018-12-29 stsp static const struct got_error *
79 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
81 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
82 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
83 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
84 507dc3bb 2018-12-29 stsp char *path = NULL;
86 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
87 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
88 507dc3bb 2018-12-29 stsp path = NULL;
92 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
96 507dc3bb 2018-12-29 stsp if (content) {
97 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
98 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
99 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
104 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
105 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
106 2a57020b 2019-02-20 stsp unlink(tmppath);
111 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
112 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
113 230a42bd 2019-05-11 jcs free(tmppath);
114 09fe317a 2018-03-11 stsp return err;
117 024e9686 2019-05-14 stsp static const struct got_error *
118 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
120 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
121 024e9686 2019-05-14 stsp char *refstr = NULL;
123 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
124 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
125 024e9686 2019-05-14 stsp if (refstr == NULL)
126 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
128 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
129 024e9686 2019-05-14 stsp if (refstr == NULL)
130 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
132 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
133 024e9686 2019-05-14 stsp free(refstr);
134 024e9686 2019-05-14 stsp return err;
137 86c3caaf 2018-03-09 stsp const struct got_error *
138 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
139 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
141 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
142 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
143 ec22038e 2019-03-10 stsp uuid_t uuid;
144 ec22038e 2019-03-10 stsp uint32_t uuid_status;
145 65596e15 2018-12-24 stsp int obj_type;
146 7ac97322 2018-03-11 stsp char *path_got = NULL;
147 1451e70d 2018-03-10 stsp char *formatstr = NULL;
148 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
149 65596e15 2018-12-24 stsp char *basestr = NULL;
150 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
152 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
153 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
157 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
159 65596e15 2018-12-24 stsp return err;
160 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
162 65596e15 2018-12-24 stsp return err;
163 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
164 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
166 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
167 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
168 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
171 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
172 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
173 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
177 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
178 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
179 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
182 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
183 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
187 056e7441 2018-03-11 stsp /* Create an empty lock file. */
188 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
192 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
193 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
197 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
198 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
202 65596e15 2018-12-24 stsp /* Record our base commit. */
203 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
206 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
210 1451e70d 2018-03-10 stsp /* Store path to repository. */
211 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
212 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
216 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
217 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
218 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
222 ec22038e 2019-03-10 stsp /* Generate UUID. */
223 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
224 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
225 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
228 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
229 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
230 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
233 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
237 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
238 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
239 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
242 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
247 65596e15 2018-12-24 stsp free(commit_id);
248 7ac97322 2018-03-11 stsp free(path_got);
249 1451e70d 2018-03-10 stsp free(formatstr);
250 0bb8a95e 2018-03-12 stsp free(absprefix);
251 65596e15 2018-12-24 stsp free(basestr);
252 ec22038e 2019-03-10 stsp free(uuidstr);
253 86c3caaf 2018-03-09 stsp return err;
256 247140b2 2019-02-05 stsp const struct got_error *
257 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
258 e5dc7198 2018-12-29 stsp const char *path_prefix)
260 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
262 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
263 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
264 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
266 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
267 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
268 e5dc7198 2018-12-29 stsp free(absprefix);
269 e5dc7198 2018-12-29 stsp return NULL;
272 bc70eb79 2019-05-09 stsp const char *
273 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
275 36a38700 2019-05-10 stsp return worktree->head_ref_name;
278 024e9686 2019-05-14 stsp const struct got_error *
279 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
280 024e9686 2019-05-14 stsp struct got_reference *head_ref)
282 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
283 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
285 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
286 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
287 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
288 024e9686 2019-05-14 stsp path_got = NULL;
292 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
293 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
294 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
298 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
302 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
303 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
305 024e9686 2019-05-14 stsp free(path_got);
307 024e9686 2019-05-14 stsp free(head_ref_name);
308 024e9686 2019-05-14 stsp return err;
311 b72f483a 2019-02-05 stsp struct got_object_id *
312 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
314 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
317 507dc3bb 2018-12-29 stsp const struct got_error *
318 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
319 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
321 507dc3bb 2018-12-29 stsp const struct got_error *err;
322 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
323 507dc3bb 2018-12-29 stsp char *id_str = NULL;
324 507dc3bb 2018-12-29 stsp char *path_got = NULL;
326 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
327 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
328 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
329 507dc3bb 2018-12-29 stsp path_got = NULL;
333 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
335 507dc3bb 2018-12-29 stsp return err;
337 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
338 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
342 507dc3bb 2018-12-29 stsp /* Record our base commit. */
343 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
346 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
350 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
351 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
352 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
353 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
358 507dc3bb 2018-12-29 stsp got_object_close(obj);
359 507dc3bb 2018-12-29 stsp free(id_str);
360 507dc3bb 2018-12-29 stsp free(path_got);
361 507dc3bb 2018-12-29 stsp return err;
364 50b0790e 2020-09-11 stsp const struct got_gotconfig *
365 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
367 50b0790e 2020-09-11 stsp return worktree->gotconfig;
370 9d31a1d8 2018-03-11 stsp static const struct got_error *
371 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
373 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
374 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
375 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
376 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
377 86c3caaf 2018-03-09 stsp return NULL;
380 21908da4 2019-01-13 stsp static const struct got_error *
381 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
383 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
384 4a1ddfc2 2019-01-12 stsp char *abspath;
386 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
387 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
389 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
390 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
391 ddcd8544 2019-03-11 stsp struct stat sb;
392 ddcd8544 2019-03-11 stsp err = NULL;
393 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
394 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
395 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
396 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
397 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
400 4a1ddfc2 2019-01-12 stsp free(abspath);
401 68c76935 2019-02-19 stsp return err;
404 68c76935 2019-02-19 stsp static const struct got_error *
405 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
407 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
408 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
409 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
410 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
415 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
416 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
417 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
420 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
421 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
422 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
425 68c76935 2019-02-19 stsp if (flen1 == 0) {
426 68c76935 2019-02-19 stsp if (flen2 != 0)
429 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
430 68c76935 2019-02-19 stsp if (flen1 != 0)
433 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
434 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
444 68c76935 2019-02-19 stsp return err;
447 68c76935 2019-02-19 stsp static const struct got_error *
448 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
450 68c76935 2019-02-19 stsp struct stat sb;
451 68c76935 2019-02-19 stsp size_t size1, size2;
455 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
456 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
457 68c76935 2019-02-19 stsp size1 = sb.st_size;
459 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
460 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
461 68c76935 2019-02-19 stsp size2 = sb.st_size;
463 68c76935 2019-02-19 stsp if (size1 != size2) {
465 68c76935 2019-02-19 stsp return NULL;
468 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
469 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
470 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
471 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
473 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
476 24f136e0 2021-11-20 thomas static const struct got_error *
477 24f136e0 2021-11-20 thomas copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
479 24f136e0 2021-11-20 thomas uint8_t fbuf[65536];
480 24f136e0 2021-11-20 thomas size_t flen;
481 24f136e0 2021-11-20 thomas ssize_t outlen;
483 24f136e0 2021-11-20 thomas *outsize = 0;
485 24f136e0 2021-11-20 thomas if (fseek(f, 0L, SEEK_SET) == -1)
486 24f136e0 2021-11-20 thomas return got_ferror(f, GOT_ERR_IO);
488 24f136e0 2021-11-20 thomas for (;;) {
489 24f136e0 2021-11-20 thomas flen = fread(fbuf, 1, sizeof(fbuf), f);
490 24f136e0 2021-11-20 thomas if (flen == 0) {
491 24f136e0 2021-11-20 thomas if (ferror(f))
492 24f136e0 2021-11-20 thomas return got_error_from_errno("fread");
493 24f136e0 2021-11-20 thomas if (feof(f))
496 24f136e0 2021-11-20 thomas outlen = write(outfd, fbuf, flen);
497 24f136e0 2021-11-20 thomas if (outlen == -1)
498 24f136e0 2021-11-20 thomas return got_error_from_errno("write");
499 24f136e0 2021-11-20 thomas if (outlen != flen)
500 24f136e0 2021-11-20 thomas return got_error(GOT_ERR_IO);
501 24f136e0 2021-11-20 thomas *outsize += outlen;
504 24f136e0 2021-11-20 thomas return NULL;
507 24f136e0 2021-11-20 thomas static const struct got_error *
508 24f136e0 2021-11-20 thomas merge_binary_file(int *overlapcnt, int merged_fd,
509 24f136e0 2021-11-20 thomas FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
510 24f136e0 2021-11-20 thomas const char *label_deriv, const char *label_orig, const char *label_deriv2,
511 24f136e0 2021-11-20 thomas const char *ondisk_path)
513 24f136e0 2021-11-20 thomas const struct got_error *err = NULL;
514 24f136e0 2021-11-20 thomas int same_content, changed_deriv, changed_deriv2;
515 24f136e0 2021-11-20 thomas int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
516 24f136e0 2021-11-20 thomas off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
517 24f136e0 2021-11-20 thomas char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
518 24f136e0 2021-11-20 thomas char *base_path_orig = NULL, *base_path_deriv = NULL;
519 24f136e0 2021-11-20 thomas char *base_path_deriv2 = NULL;
521 24f136e0 2021-11-20 thomas *overlapcnt = 0;
523 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_deriv2);
525 24f136e0 2021-11-20 thomas return err;
527 24f136e0 2021-11-20 thomas if (same_content)
528 24f136e0 2021-11-20 thomas return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
530 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_orig);
532 24f136e0 2021-11-20 thomas return err;
533 24f136e0 2021-11-20 thomas changed_deriv = !same_content;
534 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv2, f_orig);
536 24f136e0 2021-11-20 thomas return err;
537 24f136e0 2021-11-20 thomas changed_deriv2 = !same_content;
539 24f136e0 2021-11-20 thomas if (changed_deriv && changed_deriv2) {
540 24f136e0 2021-11-20 thomas *overlapcnt = 1;
541 24f136e0 2021-11-20 thomas if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
542 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
543 24f136e0 2021-11-20 thomas goto done;
545 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
546 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
547 24f136e0 2021-11-20 thomas goto done;
549 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
550 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
551 24f136e0 2021-11-20 thomas goto done;
553 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_orig, &fd_orig,
554 24f136e0 2021-11-20 thomas base_path_orig);
556 24f136e0 2021-11-20 thomas goto done;
557 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
558 24f136e0 2021-11-20 thomas base_path_deriv);
560 24f136e0 2021-11-20 thomas goto done;
561 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
562 24f136e0 2021-11-20 thomas base_path_deriv2);
564 24f136e0 2021-11-20 thomas goto done;
565 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
567 24f136e0 2021-11-20 thomas goto done;
568 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
570 24f136e0 2021-11-20 thomas goto done;
571 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
573 24f136e0 2021-11-20 thomas goto done;
574 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "Binary files differ and cannot be "
575 24f136e0 2021-11-20 thomas "merged automatically:\n") < 0) {
576 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
577 24f136e0 2021-11-20 thomas goto done;
579 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
580 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_BEGIN,
581 24f136e0 2021-11-20 thomas label_deriv ? " " : "",
582 24f136e0 2021-11-20 thomas label_deriv ? label_deriv : "",
583 24f136e0 2021-11-20 thomas path_deriv) < 0) {
584 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
585 24f136e0 2021-11-20 thomas goto done;
587 24f136e0 2021-11-20 thomas if (size_orig > 0) {
588 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
589 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_ORIG,
590 24f136e0 2021-11-20 thomas label_orig ? " " : "",
591 24f136e0 2021-11-20 thomas label_orig ? label_orig : "",
592 24f136e0 2021-11-20 thomas path_orig) < 0) {
593 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
594 24f136e0 2021-11-20 thomas goto done;
597 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
598 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_SEP,
599 24f136e0 2021-11-20 thomas path_deriv2,
600 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_END,
601 24f136e0 2021-11-20 thomas label_deriv2 ? " " : "",
602 24f136e0 2021-11-20 thomas label_deriv2 ? label_deriv2 : "") < 0) {
603 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
604 24f136e0 2021-11-20 thomas goto done;
606 24f136e0 2021-11-20 thomas } else if (changed_deriv)
607 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
608 24f136e0 2021-11-20 thomas else if (changed_deriv2)
609 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
611 24f136e0 2021-11-20 thomas if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
612 24f136e0 2021-11-20 thomas err == NULL)
613 24f136e0 2021-11-20 thomas err = got_error_from_errno2("unlink", path_orig);
614 24f136e0 2021-11-20 thomas if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
615 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_orig);
616 24f136e0 2021-11-20 thomas if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
617 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv);
618 24f136e0 2021-11-20 thomas if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
619 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv2);
620 24f136e0 2021-11-20 thomas free(path_orig);
621 24f136e0 2021-11-20 thomas free(path_deriv);
622 24f136e0 2021-11-20 thomas free(path_deriv2);
623 24f136e0 2021-11-20 thomas free(base_path_orig);
624 24f136e0 2021-11-20 thomas free(base_path_deriv);
625 24f136e0 2021-11-20 thomas free(base_path_deriv2);
626 24f136e0 2021-11-20 thomas return err;
630 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
631 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
632 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
633 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
634 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
636 6353ad76 2019-02-08 stsp static const struct got_error *
637 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
638 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
639 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
640 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
641 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
642 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
644 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
645 6353ad76 2019-02-08 stsp int merged_fd = -1;
646 db590691 2021-06-02 stsp FILE *f_merged = NULL;
647 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
648 234035bc 2019-06-01 stsp int overlapcnt = 0;
649 3524bbf9 2020-10-20 stsp char *parent = NULL;
651 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
653 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
655 3524bbf9 2020-10-20 stsp return err;
657 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
658 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
662 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
666 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
667 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
668 24f136e0 2021-11-20 thomas if (err) {
669 24f136e0 2021-11-20 thomas if (err->code != GOT_ERR_FILE_BINARY)
670 24f136e0 2021-11-20 thomas goto done;
671 24f136e0 2021-11-20 thomas err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
672 24f136e0 2021-11-20 thomas f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
673 24f136e0 2021-11-20 thomas ondisk_path);
675 24f136e0 2021-11-20 thomas goto done;
678 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
679 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
683 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
684 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
688 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
689 db590691 2021-06-02 stsp if (f_merged == NULL) {
690 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
693 db590691 2021-06-02 stsp merged_fd = -1;
695 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
696 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
697 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
703 db590691 2021-06-02 stsp if (fchmod(fileno(f_merged), st_mode) != 0) {
704 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
708 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
709 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
710 230a42bd 2019-05-11 jcs ondisk_path);
715 fdcb7daf 2019-12-15 stsp if (merged_path)
716 fdcb7daf 2019-12-15 stsp unlink(merged_path);
718 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
719 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
720 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
721 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
722 6353ad76 2019-02-08 stsp free(merged_path);
723 af54ae4a 2019-02-19 stsp free(base_path);
724 3524bbf9 2020-10-20 stsp free(parent);
725 af57b12a 2020-07-23 stsp return err;
728 af57b12a 2020-07-23 stsp static const struct got_error *
729 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
730 af57b12a 2020-07-23 stsp size_t target_len)
732 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
733 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
734 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
735 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
736 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
737 af57b12a 2020-07-23 stsp ondisk_path);
738 af57b12a 2020-07-23 stsp return NULL;
742 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
743 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
744 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
745 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
747 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
748 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
750 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
751 993e2a1b 2020-07-23 stsp * has deleted this symlink.
753 11cc08c1 2020-07-23 stsp static const struct got_error *
754 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
755 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
756 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
758 11cc08c1 2020-07-23 stsp const struct got_error *err;
759 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
760 11cc08c1 2020-07-23 stsp FILE *f = NULL;
762 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
764 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
766 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
767 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
768 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
772 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
774 3818e3c4 2020-11-01 naddy goto done;
776 3818e3c4 2020-11-01 naddy if (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
777 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
781 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
782 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
783 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
784 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
785 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
786 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
787 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
788 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
789 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
790 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
794 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
795 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
798 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
799 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
803 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
804 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
805 11cc08c1 2020-07-23 stsp free(path);
806 11cc08c1 2020-07-23 stsp free(id_str);
807 11cc08c1 2020-07-23 stsp free(label_deriv);
808 11cc08c1 2020-07-23 stsp return err;
811 d219f183 2020-07-23 stsp /* forward declaration */
812 d219f183 2020-07-23 stsp static const struct got_error *
813 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
814 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
815 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
816 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
819 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
820 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
821 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
822 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
824 af57b12a 2020-07-23 stsp static const struct got_error *
825 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
826 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
827 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
828 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
829 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
831 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
832 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
833 af57b12a 2020-07-23 stsp struct stat sb;
834 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
835 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
836 11cc08c1 2020-07-23 stsp int have_local_change = 0;
837 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
839 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
840 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
842 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
843 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
844 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
845 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
846 af57b12a 2020-07-23 stsp ondisk_path);
849 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
851 526a746f 2020-07-23 stsp if (blob_orig) {
852 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
857 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
858 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
859 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
860 11cc08c1 2020-07-23 stsp have_local_change = 1;
862 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
863 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
864 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
865 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
866 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
868 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
869 11cc08c1 2020-07-23 stsp if (ancestor_target) {
870 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
871 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
873 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
874 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
875 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
876 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
879 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
880 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
881 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
882 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
885 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
888 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
889 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
890 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
891 af57b12a 2020-07-23 stsp strlen(deriv_target));
894 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
895 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
896 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
897 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
898 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
899 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
902 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
903 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
904 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
907 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
913 af57b12a 2020-07-23 stsp free(ancestor_target);
914 eec2f5a9 2021-06-03 stsp return err;
917 eec2f5a9 2021-06-03 stsp static const struct got_error *
918 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
920 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
921 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
922 eec2f5a9 2021-06-03 stsp ssize_t target_len;
926 eec2f5a9 2021-06-03 stsp *outfile = NULL;
928 eec2f5a9 2021-06-03 stsp f = got_opentemp();
929 eec2f5a9 2021-06-03 stsp if (f == NULL)
930 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
931 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
932 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
933 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
936 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
937 eec2f5a9 2021-06-03 stsp if (n != target_len) {
938 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
941 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
942 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
945 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
946 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
953 eec2f5a9 2021-06-03 stsp *outfile = f;
954 14c901f1 2019-08-08 stsp return err;
958 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
959 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
960 14c901f1 2019-08-08 stsp * acts as the second derived version.
962 14c901f1 2019-08-08 stsp static const struct got_error *
963 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
964 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
965 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
966 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
967 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
968 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
970 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
971 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
972 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
973 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
974 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
976 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
978 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
980 ed6b5030 2020-10-20 stsp return err;
982 67a66647 2021-05-31 stsp if (blob_orig) {
983 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
984 67a66647 2021-05-31 stsp parent) == -1) {
985 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
986 67a66647 2021-05-31 stsp base_path = NULL;
990 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
993 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
994 67a66647 2021-05-31 stsp blob_orig);
997 67a66647 2021-05-31 stsp free(base_path);
1000 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1001 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1002 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1004 db590691 2021-06-02 stsp f_orig = got_opentemp();
1005 db590691 2021-06-02 stsp if (f_orig == NULL) {
1006 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1007 db590691 2021-06-02 stsp goto done;
1011 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1012 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1013 14c901f1 2019-08-08 stsp base_path = NULL;
1014 14c901f1 2019-08-08 stsp goto done;
1017 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1019 14c901f1 2019-08-08 stsp goto done;
1020 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1021 14c901f1 2019-08-08 stsp blob_deriv);
1023 14c901f1 2019-08-08 stsp goto done;
1025 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1027 14c901f1 2019-08-08 stsp goto done;
1028 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1029 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1030 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1031 14c901f1 2019-08-08 stsp goto done;
1035 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1036 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1038 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1039 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1041 eec2f5a9 2021-06-03 stsp goto done;
1044 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1045 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1046 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1047 eec2f5a9 2021-06-03 stsp goto done;
1049 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1050 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1051 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1052 eec2f5a9 2021-06-03 stsp close(fd);
1053 eec2f5a9 2021-06-03 stsp goto done;
1057 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1058 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1059 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1061 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1062 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1063 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1064 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1065 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1066 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1067 14c901f1 2019-08-08 stsp free(base_path);
1068 67a66647 2021-05-31 stsp if (blob_orig_path) {
1069 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1070 67a66647 2021-05-31 stsp free(blob_orig_path);
1072 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1073 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1074 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1076 6353ad76 2019-02-08 stsp free(id_str);
1077 818c7501 2019-07-11 stsp free(label_deriv);
1078 ed6b5030 2020-10-20 stsp free(parent);
1079 4a1ddfc2 2019-01-12 stsp return err;
1082 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1083 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1084 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1085 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1087 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1088 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1090 65b05cec 2020-07-23 stsp *new_iep = NULL;
1092 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1094 054041d0 2020-06-24 stsp return err;
1096 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1097 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1099 054041d0 2020-06-24 stsp goto done;
1101 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1104 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1106 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1107 13d9040b 2019-03-27 stsp return err;
1110 1ebedb77 2019-10-19 stsp static mode_t
1111 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1113 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1115 1ebedb77 2019-10-19 stsp if (executable) {
1116 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1117 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1118 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1119 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1120 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1121 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1124 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1127 8ba819a3 2020-07-23 stsp /* forward declaration */
1128 13d9040b 2019-03-27 stsp static const struct got_error *
1129 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1130 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1131 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1132 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1133 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1134 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1137 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1138 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1140 8ba819a3 2020-07-23 stsp static const struct got_error *
1141 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1142 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1144 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1145 5a1fbc73 2020-07-23 stsp ssize_t elen;
1146 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1149 c6e8a826 2021-04-05 stsp *did_something = 0;
1152 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1153 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1154 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1155 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1156 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1157 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1159 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1160 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1161 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink())
1162 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1164 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1165 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1166 5a1fbc73 2020-07-23 stsp if (elen == -1)
1167 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1169 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1170 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1171 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1174 c6e8a826 2021-04-05 stsp *did_something = 1;
1175 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1176 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1177 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1178 5a1fbc73 2020-07-23 stsp return err;
1181 3c1ec782 2020-07-23 stsp static const struct got_error *
1182 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1183 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1185 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1186 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1187 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1189 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1191 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1192 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1193 3c1ec782 2020-07-23 stsp return NULL;
1197 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1198 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1199 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1200 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1201 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1203 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1204 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1205 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1207 ce031e9e 2020-10-20 stsp return err;
1208 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1209 ce031e9e 2020-10-20 stsp free(parent);
1210 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1212 ce031e9e 2020-10-20 stsp free(parent);
1213 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1214 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1215 3c1ec782 2020-07-23 stsp free(abspath);
1216 3c1ec782 2020-07-23 stsp return err;
1218 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1219 3c1ec782 2020-07-23 stsp free(abspath);
1221 3c1ec782 2020-07-23 stsp return err;
1223 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1225 3c1ec782 2020-07-23 stsp return err;
1228 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1229 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1230 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1231 3c1ec782 2020-07-23 stsp return NULL;
1234 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1235 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1236 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1237 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1238 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1239 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1241 3c1ec782 2020-07-23 stsp free(path_got);
1242 3c1ec782 2020-07-23 stsp return NULL;
1245 5a1fbc73 2020-07-23 stsp static const struct got_error *
1246 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1247 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1248 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1249 ace90326 2021-09-27 thomas int path_is_unversioned, int allow_bad_symlinks,
1250 ace90326 2021-09-27 thomas struct got_repository *repo,
1251 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1253 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1254 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1255 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1256 906c123b 2020-07-23 stsp char *path_got = NULL;
1257 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1258 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1260 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1263 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1264 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1265 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1266 8ba819a3 2020-07-23 stsp * in the blob object.
1269 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1270 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1271 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1272 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1273 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1274 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1275 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1276 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1277 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1278 3b9f0f87 2020-07-23 stsp progress_arg);
1280 8ba819a3 2020-07-23 stsp if (len > 0) {
1281 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1282 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1283 8ba819a3 2020-07-23 stsp len - hdrlen);
1284 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1285 8ba819a3 2020-07-23 stsp hdrlen = 0;
1287 8ba819a3 2020-07-23 stsp } while (len != 0);
1288 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1290 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1291 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1293 3c1ec782 2020-07-23 stsp return err;
1295 ace90326 2021-09-27 thomas if (*is_bad_symlink && !allow_bad_symlinks) {
1296 906c123b 2020-07-23 stsp /* install as a regular file */
1297 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1298 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1299 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1300 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1301 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1302 906c123b 2020-07-23 stsp goto done;
1305 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1306 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1307 c6e8a826 2021-04-05 stsp int symlink_replaced;
1308 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1309 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1310 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1311 c90c8ce3 2020-07-23 stsp goto done;
1313 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1314 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1316 f35fa46a 2020-07-23 stsp goto done;
1317 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1318 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1319 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1320 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1321 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1322 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1324 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1325 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1328 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1331 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1332 f4994adc 2020-10-20 stsp char *parent;
1333 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1335 f4994adc 2020-10-20 stsp goto done;
1336 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1337 f4994adc 2020-10-20 stsp free(parent);
1339 f35fa46a 2020-07-23 stsp goto done;
1341 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1342 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1344 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1345 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1346 f35fa46a 2020-07-23 stsp goto done;
1350 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1351 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1352 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1353 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1354 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1355 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1356 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1357 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1358 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1359 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1360 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1361 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1362 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1364 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1365 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1367 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1368 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1369 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1371 906c123b 2020-07-23 stsp free(path_got);
1372 8ba819a3 2020-07-23 stsp return err;
1375 8ba819a3 2020-07-23 stsp static const struct got_error *
1376 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1377 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1378 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1379 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1380 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1381 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1383 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1384 507dc3bb 2018-12-29 stsp int fd = -1;
1385 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1386 507dc3bb 2018-12-29 stsp int update = 0;
1387 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1389 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1390 06340621 2021-12-31 thomas O_CLOEXEC, GOT_DEFAULT_FILE_MODE);
1391 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1392 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1393 f5375317 2020-10-20 stsp char *parent;
1394 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1396 f5375317 2020-10-20 stsp return err;
1397 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1398 f5375317 2020-10-20 stsp free(parent);
1400 21908da4 2019-01-13 stsp return err;
1401 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1402 06340621 2021-12-31 thomas O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1403 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1404 21908da4 2019-01-13 stsp if (fd == -1)
1405 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1406 230a42bd 2019-05-11 jcs ondisk_path);
1407 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1408 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1409 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1410 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1411 3b9f0f87 2020-07-23 stsp goto done;
1413 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1414 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1415 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1416 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1417 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1418 507dc3bb 2018-12-29 stsp goto done;
1420 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1421 507dc3bb 2018-12-29 stsp ondisk_path);
1423 507dc3bb 2018-12-29 stsp goto done;
1424 507dc3bb 2018-12-29 stsp update = 1;
1427 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1430 3818e3c4 2020-11-01 naddy if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1431 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod",
1432 3818e3c4 2020-11-01 naddy update ? tmppath : ondisk_path);
1433 3818e3c4 2020-11-01 naddy goto done;
1436 bd6aa359 2020-07-23 stsp if (progress_cb) {
1437 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1438 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1440 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1441 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1444 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1445 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1447 bd6aa359 2020-07-23 stsp goto done;
1450 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1452 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1453 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1456 9d31a1d8 2018-03-11 stsp if (len > 0) {
1457 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1458 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1459 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1460 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1461 b87c6f83 2018-12-24 stsp goto done;
1462 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1463 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1464 b87c6f83 2018-12-24 stsp goto done;
1466 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1468 9d31a1d8 2018-03-11 stsp } while (len != 0);
1470 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1471 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1472 816dc654 2019-02-16 stsp goto done;
1475 507dc3bb 2018-12-29 stsp if (update) {
1476 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1477 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1478 f6d8c0ac 2020-11-09 stsp goto done;
1480 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1481 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1482 230a42bd 2019-05-11 jcs ondisk_path);
1483 68ed9ba5 2019-02-10 stsp goto done;
1485 63df146d 2020-11-09 stsp free(tmppath);
1486 63df146d 2020-11-09 stsp tmppath = NULL;
1490 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1491 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1492 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1493 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1494 507dc3bb 2018-12-29 stsp free(tmppath);
1495 6353ad76 2019-02-08 stsp return err;
1498 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1499 6353ad76 2019-02-08 stsp static const struct got_error *
1500 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1502 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1503 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1504 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1505 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1506 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1508 7154f6ce 2019-03-27 stsp int i = 0;
1509 9bdd68dd 2020-01-02 naddy char *line = NULL;
1510 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1511 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1513 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1514 9bdd68dd 2020-01-02 naddy linelen = getline(&line, &linesize, f);
1515 9bdd68dd 2020-01-02 naddy if (linelen == -1) {
1516 7154f6ce 2019-03-27 stsp if (feof(f))
1518 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1522 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1523 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1525 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1530 9bdd68dd 2020-01-02 naddy free(line);
1532 7154f6ce 2019-03-27 stsp return err;
1535 e2b1e152 2019-07-13 stsp static int
1536 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1538 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1539 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1542 1ebedb77 2019-10-19 stsp static int
1543 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1545 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1546 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1547 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1548 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1549 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1550 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1553 c363b2c1 2019-08-03 stsp static unsigned char
1554 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1556 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1557 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1558 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1559 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1560 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1561 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1562 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1564 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1568 a919d5c4 2020-07-23 stsp static const struct got_error *
1569 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1570 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1571 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1573 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1574 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1575 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1576 a919d5c4 2020-07-23 stsp ssize_t elen;
1577 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1578 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1579 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1581 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1583 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1585 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1587 a919d5c4 2020-07-23 stsp return err;
1588 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1590 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1591 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1593 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1595 a919d5c4 2020-07-23 stsp if (len > 0) {
1596 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1597 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1598 a919d5c4 2020-07-23 stsp len - hdrlen);
1599 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1600 a919d5c4 2020-07-23 stsp hdrlen = 0;
1602 a919d5c4 2020-07-23 stsp } while (len != 0);
1603 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1605 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1606 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1607 a919d5c4 2020-07-23 stsp if (elen == -1)
1608 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1610 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1611 a919d5c4 2020-07-23 stsp if (elen == -1)
1612 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1615 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1616 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1618 a919d5c4 2020-07-23 stsp return NULL;
1621 7154f6ce 2019-03-27 stsp static const struct got_error *
1622 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1623 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1624 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1626 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1627 6353ad76 2019-02-08 stsp struct got_object_id id;
1628 6353ad76 2019-02-08 stsp size_t hdrlen;
1629 f4ae6ddb 2022-07-01 thomas int fd = -1, fd1 = -1;
1630 6353ad76 2019-02-08 stsp FILE *f = NULL;
1631 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1632 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1633 6353ad76 2019-02-08 stsp size_t flen, blen;
1634 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1636 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1637 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1640 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1641 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1642 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1644 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1645 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1646 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1647 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1648 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1650 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1651 882ef1b9 2019-12-13 stsp goto done;
1653 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1654 3d35a492 2019-12-13 stsp goto done;
1657 06340621 2021-12-31 thomas fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1658 3dc1dc04 2021-09-27 thomas if (fd == -1 && errno != ENOENT &&
1659 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
1660 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1661 3dc1dc04 2021-09-27 thomas else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1662 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1663 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1664 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1665 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1666 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1667 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1669 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1670 3d35a492 2019-12-13 stsp goto done;
1672 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1673 1338848f 2019-12-13 stsp goto done;
1677 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1678 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1679 1338848f 2019-12-13 stsp goto done;
1682 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1683 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1684 1338848f 2019-12-13 stsp goto done;
1685 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1686 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1687 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1688 1338848f 2019-12-13 stsp goto done;
1691 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1692 f179e66d 2020-07-23 stsp goto done;
1694 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1695 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1696 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1697 1338848f 2019-12-13 stsp goto done;
1700 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1701 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1702 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1704 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1706 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
1707 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
1708 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1709 f4ae6ddb 2022-07-01 thomas goto done;
1711 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1713 1338848f 2019-12-13 stsp goto done;
1715 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1716 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1717 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1718 a919d5c4 2020-07-23 stsp goto done;
1721 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1722 fc63f50d 2021-12-31 thomas fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1723 ab0d4361 2019-12-13 stsp if (fd == -1) {
1724 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1725 ab0d4361 2019-12-13 stsp goto done;
1729 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1730 6353ad76 2019-02-08 stsp if (f == NULL) {
1731 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1732 6353ad76 2019-02-08 stsp goto done;
1735 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1737 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1738 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1740 7154f6ce 2019-03-27 stsp goto done;
1741 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1742 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1743 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1744 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1745 7154f6ce 2019-03-27 stsp goto done;
1747 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1748 6353ad76 2019-02-08 stsp if (flen != 0)
1749 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1751 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1752 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1753 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1755 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1756 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1757 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1758 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1762 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1765 6353ad76 2019-02-08 stsp hdrlen = 0;
1768 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1769 7154f6ce 2019-03-27 stsp rewind(f);
1770 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1771 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1772 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1774 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1775 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
1777 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1778 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1779 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1780 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1781 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1782 9d31a1d8 2018-03-11 stsp return err;
1786 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1787 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1789 e2b1e152 2019-07-13 stsp static const struct got_error *
1790 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1791 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1793 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1794 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1795 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1797 e2b1e152 2019-07-13 stsp return NULL;
1800 9d31a1d8 2018-03-11 stsp static const struct got_error *
1801 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1802 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1803 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1804 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1805 0584f854 2019-04-06 stsp void *progress_arg)
1807 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1808 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1809 f4ae6ddb 2022-07-01 thomas char *ondisk_path = NULL;
1810 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1811 b8f41171 2019-02-10 stsp struct stat sb;
1812 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
1814 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1815 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1818 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1819 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1820 a76c42e6 2019-08-03 stsp goto done;
1822 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1825 abb4604f 2019-07-27 stsp goto done;
1826 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1827 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1829 e6f4ba31 2021-09-24 thomas if (stat(ondisk_path, &sb) == -1) {
1830 e6f4ba31 2021-09-24 thomas if (errno != ENOENT) {
1831 e6f4ba31 2021-09-24 thomas err = got_error_from_errno2("stat",
1832 e6f4ba31 2021-09-24 thomas ondisk_path);
1833 e6f4ba31 2021-09-24 thomas goto done;
1835 e6f4ba31 2021-09-24 thomas sb.st_mode = GOT_DEFAULT_FILE_MODE;
1836 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1837 e6f4ba31 2021-09-24 thomas } else {
1838 e6f4ba31 2021-09-24 thomas if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1839 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1841 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_OBSTRUCTED;
1845 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1847 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1848 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1849 b8f41171 2019-02-10 stsp goto done;
1851 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1853 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1854 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1856 5036ab18 2020-04-18 stsp goto done;
1859 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1860 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1861 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1863 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1864 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1865 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1866 c6e8a826 2021-04-05 stsp * updating contents of this file.
1868 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1869 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1870 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1871 c6e8a826 2021-04-05 stsp /* Same commit. */
1872 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1873 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1875 e2b1e152 2019-07-13 stsp goto done;
1876 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1878 6353ad76 2019-02-08 stsp goto done;
1880 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1881 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1882 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1883 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1884 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1885 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1887 0f58026f 2021-04-05 stsp goto done;
1888 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1890 b8f41171 2019-02-10 stsp goto done;
1894 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
1895 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
1896 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1897 f4ae6ddb 2022-07-01 thomas goto done;
1899 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1901 6353ad76 2019-02-08 stsp goto done;
1903 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1904 234035bc 2019-06-01 stsp int update_timestamps;
1905 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1906 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1907 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1908 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
1909 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
1910 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1911 f4ae6ddb 2022-07-01 thomas goto done;
1913 234035bc 2019-06-01 stsp struct got_object_id id2;
1914 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1915 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1918 f69721c3 2019-10-21 stsp goto done;
1920 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1921 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1922 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1923 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1924 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1925 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1926 f69721c3 2019-10-21 stsp goto done;
1928 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1929 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1930 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1931 234035bc 2019-06-01 stsp goto done;
1934 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1935 36bf999c 2020-07-23 stsp char *link_target;
1936 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1938 36bf999c 2020-07-23 stsp goto done;
1939 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1940 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1941 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1942 36bf999c 2020-07-23 stsp free(link_target);
1944 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1945 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1946 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1947 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1949 f69721c3 2019-10-21 stsp free(label_orig);
1950 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1951 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
1952 f4ae6ddb 2022-07-01 thomas goto done;
1954 234035bc 2019-06-01 stsp if (blob2)
1955 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1957 909d120e 2019-09-22 stsp goto done;
1959 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1960 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1961 234035bc 2019-06-01 stsp * unmodified files again.
1963 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1964 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1965 234035bc 2019-06-01 stsp update_timestamps);
1966 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1967 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1968 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1969 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1970 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1972 1ee397ad 2019-07-12 stsp goto done;
1973 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1974 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1976 13d9040b 2019-03-27 stsp goto done;
1978 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1979 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1980 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1981 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1982 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1983 ace90326 2021-09-27 thomas status == GOT_STATUS_UNVERSIONED, 0,
1984 ace90326 2021-09-27 thomas repo, progress_cb, progress_arg);
1986 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1987 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
1988 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
1989 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1990 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1993 13d9040b 2019-03-27 stsp goto done;
1996 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
1997 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
1998 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2000 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2001 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2002 054041d0 2020-06-24 stsp &blob->id);
2005 13d9040b 2019-03-27 stsp goto done;
2007 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2008 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2009 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2013 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2014 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
2015 f4ae6ddb 2022-07-01 thomas goto done;
2017 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2019 6353ad76 2019-02-08 stsp free(ondisk_path);
2020 8da9e5f4 2019-01-12 stsp return err;
2023 90285c3b 2019-01-08 stsp static const struct got_error *
2024 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2026 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2027 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2029 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2030 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2032 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2033 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2034 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2036 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2037 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2039 1c4cdd89 2021-06-20 stsp goto done;
2040 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2041 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2042 fddefe3b 2020-10-20 stsp free(ondisk_path);
2043 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2044 1c4cdd89 2021-06-20 stsp parent = NULL;
2045 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2046 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2047 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2048 fddefe3b 2020-10-20 stsp ondisk_path);
2051 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2057 90285c3b 2019-01-08 stsp free(ondisk_path);
2058 1c4cdd89 2021-06-20 stsp free(parent);
2059 90285c3b 2019-01-08 stsp return err;
2062 708d8e67 2019-03-27 stsp static const struct got_error *
2063 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2064 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2065 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2067 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2068 708d8e67 2019-03-27 stsp unsigned char status;
2069 708d8e67 2019-03-27 stsp struct stat sb;
2070 708d8e67 2019-03-27 stsp char *ondisk_path;
2072 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2073 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2075 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2077 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2079 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2081 5a58a424 2020-06-23 stsp goto done;
2083 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2084 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2085 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2086 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2087 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2088 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2089 993e2a1b 2020-07-23 stsp goto done;
2091 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2092 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2093 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2094 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2096 993e2a1b 2020-07-23 stsp goto done;
2097 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2098 993e2a1b 2020-07-23 stsp ie->path);
2099 993e2a1b 2020-07-23 stsp goto done;
2102 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2103 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2104 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2106 5a58a424 2020-06-23 stsp goto done;
2108 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2109 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2111 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2112 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2114 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2116 5a58a424 2020-06-23 stsp goto done;
2117 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2118 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2120 5a58a424 2020-06-23 stsp goto done;
2122 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2125 5a58a424 2020-06-23 stsp free(ondisk_path);
2126 fc6346c4 2019-03-27 stsp return err;
2129 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2130 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2131 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2132 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2133 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2134 8da9e5f4 2019-01-12 stsp void *progress_arg;
2135 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2136 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2139 512f0d0e 2019-01-02 stsp static const struct got_error *
2140 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2141 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2143 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2145 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2146 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2148 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2149 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2152 8da9e5f4 2019-01-12 stsp static const struct got_error *
2153 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2155 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2157 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2158 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2160 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2161 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2164 9d31a1d8 2018-03-11 stsp static const struct got_error *
2165 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2167 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2168 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2169 8da9e5f4 2019-01-12 stsp char *path;
2171 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2172 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2174 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2175 63c5ca5d 2019-08-24 stsp return NULL;
2177 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2178 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2180 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2182 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2183 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2185 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2186 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2188 8da9e5f4 2019-01-12 stsp free(path);
2189 0cd1c46a 2019-03-11 stsp return err;
2192 b2118c49 2020-07-28 stsp const struct got_error *
2193 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2195 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2197 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2198 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2199 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2200 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2203 b2118c49 2020-07-28 stsp return NULL;
2206 818c7501 2019-07-11 stsp static const struct got_error *
2207 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2209 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2210 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2212 517bab73 2019-03-11 stsp *refname = NULL;
2214 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2216 b2118c49 2020-07-28 stsp return err;
2218 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2219 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2220 0647c563 2019-03-11 stsp *refname = NULL;
2222 517bab73 2019-03-11 stsp free(uuidstr);
2223 517bab73 2019-03-11 stsp return err;
2226 818c7501 2019-07-11 stsp const struct got_error *
2227 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2229 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2232 818c7501 2019-07-11 stsp static const struct got_error *
2233 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2235 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2236 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2239 818c7501 2019-07-11 stsp static const struct got_error *
2240 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2242 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2245 818c7501 2019-07-11 stsp static const struct got_error *
2246 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2248 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2249 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2252 818c7501 2019-07-11 stsp static const struct got_error *
2253 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2255 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2256 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2259 0ebf8283 2019-07-24 stsp static const struct got_error *
2260 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2262 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2263 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2266 0ebf8283 2019-07-24 stsp static const struct got_error *
2267 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2269 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2270 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2273 0ebf8283 2019-07-24 stsp static const struct got_error *
2274 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2276 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2277 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2280 0ebf8283 2019-07-24 stsp static const struct got_error *
2281 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2283 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2284 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2287 0ebf8283 2019-07-24 stsp const struct got_error *
2288 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2289 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2291 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2292 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2293 0ebf8283 2019-07-24 stsp *path = NULL;
2294 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2296 0ebf8283 2019-07-24 stsp return NULL;
2299 10604dce 2021-09-24 thomas static const struct got_error *
2300 10604dce 2021-09-24 thomas get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2302 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2303 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2306 10604dce 2021-09-24 thomas static const struct got_error *
2307 10604dce 2021-09-24 thomas get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2309 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2310 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2314 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2315 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2317 517bab73 2019-03-11 stsp static const struct got_error *
2318 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2320 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2321 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2322 517bab73 2019-03-11 stsp char *refname;
2324 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2326 517bab73 2019-03-11 stsp return err;
2328 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2330 0cd1c46a 2019-03-11 stsp goto done;
2332 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2334 0cd1c46a 2019-03-11 stsp free(refname);
2336 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2337 3e3a69f1 2019-07-25 stsp return err;
2340 3e3a69f1 2019-07-25 stsp static const struct got_error *
2341 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2343 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2345 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2346 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2347 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2348 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2350 9d31a1d8 2018-03-11 stsp return err;
2354 ebf99748 2019-05-09 stsp static const struct got_error *
2355 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2356 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2358 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2359 ebf99748 2019-05-09 stsp FILE *index = NULL;
2361 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2362 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2363 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2364 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2366 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2368 ebf99748 2019-05-09 stsp goto done;
2370 c56c5d8a 2021-12-31 thomas index = fopen(*fileindex_path, "rbe");
2371 ebf99748 2019-05-09 stsp if (index == NULL) {
2372 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2373 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2375 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2376 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2377 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2380 ebf99748 2019-05-09 stsp if (err) {
2381 ebf99748 2019-05-09 stsp free(*fileindex_path);
2382 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2383 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2384 ebf99748 2019-05-09 stsp *fileindex = NULL;
2386 ebf99748 2019-05-09 stsp return err;
2389 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2390 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2391 c932eeeb 2019-05-22 stsp const char *path;
2392 c932eeeb 2019-05-22 stsp size_t path_len;
2393 c932eeeb 2019-05-22 stsp const char *entry_name;
2394 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2395 a484d721 2019-06-10 stsp void *progress_arg;
2398 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2399 c932eeeb 2019-05-22 stsp static const struct got_error *
2400 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2402 1ee397ad 2019-07-12 stsp const struct got_error *err;
2403 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2405 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2406 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2407 c932eeeb 2019-05-22 stsp return NULL;
2408 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2409 102ff934 2019-06-11 stsp return NULL;
2411 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2412 a769b60b 2021-06-27 stsp return NULL;
2414 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2415 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2416 c932eeeb 2019-05-22 stsp return NULL;
2418 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2419 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2420 edd02c5e 2019-07-11 stsp ie->path);
2422 1ee397ad 2019-07-12 stsp return err;
2424 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2425 c932eeeb 2019-05-22 stsp return NULL;
2428 a615e0e7 2020-12-16 stsp static const struct got_error *
2429 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2430 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2431 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2433 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2435 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2436 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2437 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2438 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2439 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2440 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2442 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2443 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2446 9c6338c4 2019-06-02 stsp static const struct got_error *
2447 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2449 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2450 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2451 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2452 867630bb 2020-01-17 stsp struct timespec timeout;
2454 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2455 9c6338c4 2019-06-02 stsp fileindex_path);
2457 9c6338c4 2019-06-02 stsp goto done;
2459 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2461 9c6338c4 2019-06-02 stsp goto done;
2463 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2464 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2465 9c6338c4 2019-06-02 stsp fileindex_path);
2466 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2470 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2471 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2472 867630bb 2020-01-17 stsp * was recorded in the file index.
2474 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2475 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2476 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2478 9c6338c4 2019-06-02 stsp if (new_index)
2479 9c6338c4 2019-06-02 stsp fclose(new_index);
2480 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2481 9c6338c4 2019-06-02 stsp return err;
2484 6ced4176 2019-07-12 stsp static const struct got_error *
2485 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2486 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2487 945f9229 2022-04-16 thomas struct got_commit_object *base_commit, struct got_worktree *worktree,
2488 945f9229 2022-04-16 thomas struct got_repository *repo)
2490 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2491 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2492 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2493 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2495 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2496 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2497 6ced4176 2019-07-12 stsp *tree_id = NULL;
2499 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2500 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2501 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2502 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2503 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2504 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2505 6ced4176 2019-07-12 stsp goto done;
2507 945f9229 2022-04-16 thomas err = got_object_id_by_path(tree_id, repo, base_commit,
2508 945f9229 2022-04-16 thomas worktree->path_prefix);
2510 6ced4176 2019-07-12 stsp goto done;
2511 6ced4176 2019-07-12 stsp return NULL;
2514 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2516 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2517 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2518 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2519 6ced4176 2019-07-12 stsp goto done;
2522 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2524 6ced4176 2019-07-12 stsp goto done;
2526 6ced4176 2019-07-12 stsp free(in_repo_path);
2527 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2529 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2531 6ced4176 2019-07-12 stsp goto done;
2533 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2534 6ced4176 2019-07-12 stsp /* Check out a single file. */
2535 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2536 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2537 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2538 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2539 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2540 6ced4176 2019-07-12 stsp goto done;
2542 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2543 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2544 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2545 6ced4176 2019-07-12 stsp goto done;
2548 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2549 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2551 6ced4176 2019-07-12 stsp return err;
2552 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2553 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2554 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2555 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2556 6ced4176 2019-07-12 stsp goto done;
2559 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2560 945f9229 2022-04-16 thomas base_commit, in_repo_path);
2562 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2563 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2564 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2565 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2566 6ced4176 2019-07-12 stsp goto done;
2568 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2569 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2570 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2571 6ced4176 2019-07-12 stsp goto done;
2576 6ced4176 2019-07-12 stsp free(in_repo_path);
2577 6ced4176 2019-07-12 stsp if (err) {
2578 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2579 6ced4176 2019-07-12 stsp free(*tree_relpath);
2580 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2581 6ced4176 2019-07-12 stsp free(*tree_id);
2582 6ced4176 2019-07-12 stsp *tree_id = NULL;
2584 07ed472d 2019-07-12 stsp return err;
2587 07ed472d 2019-07-12 stsp static const struct got_error *
2588 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2589 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2590 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2591 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2593 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2594 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2595 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2596 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2597 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2599 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2600 7f47418f 2019-12-20 stsp if (err) {
2601 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2602 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2603 7f47418f 2019-12-20 stsp goto done;
2604 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2605 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2607 7f47418f 2019-12-20 stsp return err;
2610 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2611 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2613 07ed472d 2019-07-12 stsp goto done;
2615 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2617 07ed472d 2019-07-12 stsp goto done;
2619 07ed472d 2019-07-12 stsp if (entry_name &&
2620 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2621 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2622 07ed472d 2019-07-12 stsp goto done;
2625 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2626 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2627 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2628 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2629 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2630 07ed472d 2019-07-12 stsp arg.repo = repo;
2631 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2632 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2633 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2634 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2635 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2636 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2639 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2640 07ed472d 2019-07-12 stsp if (commit)
2641 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2642 6ced4176 2019-07-12 stsp return err;
2645 9d31a1d8 2018-03-11 stsp const struct got_error *
2646 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2647 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2648 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2649 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2651 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2652 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2653 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2654 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2655 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2656 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2657 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2658 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2659 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2660 f2ea84fa 2019-07-27 stsp int entry_type;
2661 f2ea84fa 2019-07-27 stsp char *relpath;
2662 f2ea84fa 2019-07-27 stsp char *entry_name;
2663 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2664 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2666 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2668 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2670 9d31a1d8 2018-03-11 stsp return err;
2672 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
2673 945f9229 2022-04-16 thomas worktree->base_commit_id);
2674 945f9229 2022-04-16 thomas if (err)
2675 945f9229 2022-04-16 thomas goto done;
2677 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2678 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2679 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2680 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2681 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2682 f2ea84fa 2019-07-27 stsp goto done;
2685 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2686 945f9229 2022-04-16 thomas &tpd->relpath, &tpd->tree_id, pe->path, commit,
2687 945f9229 2022-04-16 thomas worktree, repo);
2688 f2ea84fa 2019-07-27 stsp if (err) {
2689 f2ea84fa 2019-07-27 stsp free(tpd);
2690 6ced4176 2019-07-12 stsp goto done;
2693 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2694 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2695 f2ea84fa 2019-07-27 stsp if (err) {
2696 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2697 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2698 f2ea84fa 2019-07-27 stsp free(tpd);
2699 f2ea84fa 2019-07-27 stsp goto done;
2702 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2704 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2708 51514078 2018-12-25 stsp * Read the file index.
2709 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2710 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2712 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2714 c4cdcb68 2019-04-03 stsp goto done;
2716 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2717 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2718 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2720 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2721 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2722 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2726 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2727 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2728 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2729 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2730 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2731 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2732 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2733 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2737 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2739 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2740 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2741 af12c6b9 2019-06-04 stsp err = sync_err;
2743 9c6338c4 2019-06-02 stsp free(fileindex_path);
2745 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2746 9d31a1d8 2018-03-11 stsp if (commit)
2747 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2748 5ade8233 2019-07-12 stsp if (fileindex)
2749 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2750 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2751 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2752 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2753 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2754 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2755 f2ea84fa 2019-07-27 stsp free(tpd);
2757 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2758 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2759 9d31a1d8 2018-03-11 stsp err = unlockerr;
2760 f8d1f275 2019-02-04 stsp return err;
2763 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2764 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2765 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2766 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2767 234035bc 2019-06-01 stsp void *progress_arg;
2768 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2769 234035bc 2019-06-01 stsp void *cancel_arg;
2770 f69721c3 2019-10-21 stsp const char *label_orig;
2771 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2772 ace90326 2021-09-27 thomas int allow_bad_symlinks;
2775 234035bc 2019-06-01 stsp static const struct got_error *
2776 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2777 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
2778 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
2779 a0f32f33 2022-06-13 thomas const char *path1, const char *path2,
2780 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2782 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2783 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2784 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2785 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2786 234035bc 2019-06-01 stsp struct stat sb;
2787 234035bc 2019-06-01 stsp unsigned char status;
2788 234035bc 2019-06-01 stsp int local_changes_subsumed;
2789 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2790 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2792 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2793 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2794 d6c87207 2019-08-02 stsp strlen(path2));
2795 1ee397ad 2019-07-12 stsp if (ie == NULL)
2796 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2797 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2799 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2800 234035bc 2019-06-01 stsp path2) == -1)
2801 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2803 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2806 234035bc 2019-06-01 stsp goto done;
2808 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2809 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2810 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2811 234035bc 2019-06-01 stsp goto done;
2813 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2814 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2815 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2816 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2817 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2818 234035bc 2019-06-01 stsp goto done;
2821 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2822 36bf999c 2020-07-23 stsp char *link_target2;
2823 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2825 36bf999c 2020-07-23 stsp goto done;
2826 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2827 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2828 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2829 36bf999c 2020-07-23 stsp free(link_target2);
2833 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2834 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2835 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2836 1af628f4 2021-06-03 stsp goto done;
2838 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2839 1af628f4 2021-06-03 stsp f_orig, blob1);
2841 1af628f4 2021-06-03 stsp goto done;
2843 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2844 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2845 1af628f4 2021-06-03 stsp goto done;
2846 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2847 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2849 1af628f4 2021-06-03 stsp goto done;
2851 48b4f239 2021-12-31 thomas fd = open(ondisk_path,
2852 48b4f239 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2853 1af628f4 2021-06-03 stsp if (fd == -1) {
2854 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2855 1af628f4 2021-06-03 stsp ondisk_path);
2856 1af628f4 2021-06-03 stsp goto done;
2858 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2859 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2860 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2861 1af628f4 2021-06-03 stsp ondisk_path);
2862 1af628f4 2021-06-03 stsp close(fd);
2863 1af628f4 2021-06-03 stsp goto done;
2865 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2867 1af628f4 2021-06-03 stsp goto done;
2868 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2869 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2870 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2871 1af628f4 2021-06-03 stsp goto done;
2873 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2874 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2875 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2876 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2877 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2879 234035bc 2019-06-01 stsp } else if (blob1) {
2880 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2881 d6c87207 2019-08-02 stsp strlen(path1));
2882 1ee397ad 2019-07-12 stsp if (ie == NULL)
2883 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2884 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2886 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2887 2b92fad7 2019-06-02 stsp path1) == -1)
2888 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2890 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2893 2b92fad7 2019-06-02 stsp goto done;
2895 2b92fad7 2019-06-02 stsp switch (status) {
2896 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2897 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2898 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2900 1ee397ad 2019-07-12 stsp goto done;
2901 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2903 2b92fad7 2019-06-02 stsp goto done;
2905 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2907 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2908 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2909 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2910 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2912 1ee397ad 2019-07-12 stsp goto done;
2914 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2916 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2917 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2918 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2919 e8f02263 2022-01-23 thomas off_t blob1_size;
2921 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2922 0a22ca1a 2020-09-23 stsp * exists in the repository.
2924 e8f02263 2022-01-23 thomas err = got_object_blob_file_create(&id, &blob1_f,
2925 e8f02263 2022-01-23 thomas &blob1_size, path1);
2927 0a22ca1a 2020-09-23 stsp goto done;
2928 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2929 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2930 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2932 0a22ca1a 2020-09-23 stsp goto done;
2933 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2936 0a22ca1a 2020-09-23 stsp goto done;
2938 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2941 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2942 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2944 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2945 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2948 0a22ca1a 2020-09-23 stsp goto done;
2951 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2952 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2953 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2954 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2956 1ee397ad 2019-07-12 stsp goto done;
2958 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2959 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2961 1ee397ad 2019-07-12 stsp goto done;
2966 234035bc 2019-06-01 stsp } else if (blob2) {
2967 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2968 234035bc 2019-06-01 stsp path2) == -1)
2969 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2970 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2971 d6c87207 2019-08-02 stsp strlen(path2));
2973 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2974 7f91a133 2019-12-13 stsp -1, NULL, repo);
2976 234035bc 2019-06-01 stsp goto done;
2977 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2978 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2979 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2980 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2981 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2982 1ee397ad 2019-07-12 stsp status, path2);
2983 234035bc 2019-06-01 stsp goto done;
2985 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2986 36bf999c 2020-07-23 stsp char *link_target2;
2987 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2990 36bf999c 2020-07-23 stsp goto done;
2991 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2992 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2993 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2994 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2995 36bf999c 2020-07-23 stsp free(link_target2);
2996 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2997 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2998 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2999 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3000 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3001 526a746f 2020-07-23 stsp a->progress_arg);
3003 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3004 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3007 dfe9fba0 2020-07-23 stsp goto done;
3008 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3009 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3010 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3011 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3013 234035bc 2019-06-01 stsp goto done;
3016 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3017 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3018 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3019 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3020 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3021 ace90326 2021-09-27 thomas 0, 1, a->allow_bad_symlinks, repo,
3022 ace90326 2021-09-27 thomas a->progress_cb, a->progress_arg);
3024 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3025 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3026 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3029 234035bc 2019-06-01 stsp goto done;
3030 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3032 234035bc 2019-06-01 stsp goto done;
3033 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3034 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3035 3969253a 2020-03-07 stsp if (err) {
3036 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3037 3969253a 2020-03-07 stsp goto done;
3039 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3040 2b92fad7 2019-06-02 stsp if (err) {
3041 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3042 2b92fad7 2019-06-02 stsp goto done;
3044 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3045 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3046 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3051 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3052 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3053 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3054 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3055 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3056 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3057 1af628f4 2021-06-03 stsp free(id_str);
3058 54d5be07 2021-06-03 stsp free(label_deriv2);
3059 234035bc 2019-06-01 stsp free(ondisk_path);
3060 234035bc 2019-06-01 stsp return err;
3063 69de9dd4 2021-09-03 stsp static const struct got_error *
3064 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3066 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3068 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3069 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3070 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3071 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3072 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3074 69de9dd4 2021-09-03 stsp return NULL;
3077 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3078 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3079 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3080 234035bc 2019-06-01 stsp struct got_repository *repo;
3083 234035bc 2019-06-01 stsp static const struct got_error *
3084 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3085 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
3086 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
3087 a0f32f33 2022-06-13 thomas const char *path1, const char *path2,
3088 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3090 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3091 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3092 234035bc 2019-06-01 stsp unsigned char status;
3093 234035bc 2019-06-01 stsp struct stat sb;
3094 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3095 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3096 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3097 234035bc 2019-06-01 stsp char *ondisk_path;
3099 69de9dd4 2021-09-03 stsp if (id == NULL)
3100 69de9dd4 2021-09-03 stsp return NULL;
3102 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3103 69de9dd4 2021-09-03 stsp if (ie == NULL)
3104 69de9dd4 2021-09-03 stsp return NULL;
3106 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3108 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3110 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3111 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3112 5546d466 2021-09-02 stsp free(ondisk_path);
3114 234035bc 2019-06-01 stsp return err;
3115 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3116 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3118 234035bc 2019-06-01 stsp return NULL;
3121 818c7501 2019-07-11 stsp static const struct got_error *
3122 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3123 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3124 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3125 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3126 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3128 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3129 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3130 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3131 945f9229 2022-04-16 thomas struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3132 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3133 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3134 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3135 a0f32f33 2022-06-13 thomas FILE *f1 = NULL, *f2 = NULL;
3137 03415a1a 2019-06-02 stsp if (commit_id1) {
3138 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit1, repo, commit_id1);
3139 945f9229 2022-04-16 thomas if (err)
3140 945f9229 2022-04-16 thomas goto done;
3141 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id1, repo, commit1,
3142 03415a1a 2019-06-02 stsp worktree->path_prefix);
3143 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3144 03415a1a 2019-06-02 stsp goto done;
3146 69d57f3d 2020-07-31 stsp if (tree_id1) {
3147 69d57f3d 2020-07-31 stsp char *id_str;
3149 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3151 03415a1a 2019-06-02 stsp goto done;
3153 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3155 f69721c3 2019-10-21 stsp goto done;
3157 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3158 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3159 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3160 f69721c3 2019-10-21 stsp free(id_str);
3161 f69721c3 2019-10-21 stsp goto done;
3163 f69721c3 2019-10-21 stsp free(id_str);
3165 a0f32f33 2022-06-13 thomas f1 = got_opentemp();
3166 a0f32f33 2022-06-13 thomas if (f1 == NULL) {
3167 a0f32f33 2022-06-13 thomas err = got_error_from_errno("got_opentemp");
3168 a0f32f33 2022-06-13 thomas goto done;
3172 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit2, repo, commit_id2);
3173 945f9229 2022-04-16 thomas if (err)
3174 945f9229 2022-04-16 thomas goto done;
3176 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id2, repo, commit2,
3177 234035bc 2019-06-01 stsp worktree->path_prefix);
3179 234035bc 2019-06-01 stsp goto done;
3181 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3183 234035bc 2019-06-01 stsp goto done;
3185 a0f32f33 2022-06-13 thomas f2 = got_opentemp();
3186 a0f32f33 2022-06-13 thomas if (f2 == NULL) {
3187 a0f32f33 2022-06-13 thomas err = got_error_from_errno("got_opentemp");
3188 a0f32f33 2022-06-13 thomas goto done;
3191 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3192 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3193 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3194 a0f32f33 2022-06-13 thomas err = got_diff_tree(tree1, tree2, f1, f2, "", "", repo,
3195 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3197 69de9dd4 2021-09-03 stsp goto done;
3199 234035bc 2019-06-01 stsp arg.worktree = worktree;
3200 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3201 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3202 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3203 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3204 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3205 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3206 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3207 ace90326 2021-09-27 thomas arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3208 a0f32f33 2022-06-13 thomas err = got_diff_tree(tree1, tree2, f1, f2, "", "", repo,
3209 a0f32f33 2022-06-13 thomas merge_file_cb, &arg, 1);
3210 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3211 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3212 af12c6b9 2019-06-04 stsp err = sync_err;
3214 945f9229 2022-04-16 thomas if (commit1)
3215 945f9229 2022-04-16 thomas got_object_commit_close(commit1);
3216 945f9229 2022-04-16 thomas if (commit2)
3217 945f9229 2022-04-16 thomas got_object_commit_close(commit2);
3218 234035bc 2019-06-01 stsp if (tree1)
3219 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3220 234035bc 2019-06-01 stsp if (tree2)
3221 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3222 a0f32f33 2022-06-13 thomas if (f1 && fclose(f1) == EOF && err == NULL)
3223 a0f32f33 2022-06-13 thomas err = got_error_from_errno("fclose");
3224 a0f32f33 2022-06-13 thomas if (f2 && fclose(f2) == EOF && err == NULL)
3225 a0f32f33 2022-06-13 thomas err = got_error_from_errno("fclose");
3226 f69721c3 2019-10-21 stsp free(label_orig);
3227 818c7501 2019-07-11 stsp return err;
3230 818c7501 2019-07-11 stsp const struct got_error *
3231 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3232 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3233 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3234 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3236 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3237 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3238 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3240 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3242 818c7501 2019-07-11 stsp return err;
3244 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3246 818c7501 2019-07-11 stsp goto done;
3248 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3249 69de9dd4 2021-09-03 stsp worktree);
3251 818c7501 2019-07-11 stsp goto done;
3253 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3254 10604dce 2021-09-24 thomas commit_id2, repo, progress_cb, progress_arg,
3255 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
3257 818c7501 2019-07-11 stsp if (fileindex)
3258 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3259 818c7501 2019-07-11 stsp free(fileindex_path);
3260 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3261 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3262 234035bc 2019-06-01 stsp err = unlockerr;
3263 234035bc 2019-06-01 stsp return err;
3266 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3267 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3268 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3269 927df6b7 2019-02-10 stsp const char *status_path;
3270 927df6b7 2019-02-10 stsp size_t status_path_len;
3271 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3272 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3273 f8d1f275 2019-02-04 stsp void *status_arg;
3274 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3275 f8d1f275 2019-02-04 stsp void *cancel_arg;
3276 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3277 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3278 f2a9dc41 2019-12-13 tracey int report_unchanged;
3279 3143d852 2020-06-25 stsp int no_ignores;
3282 f8d1f275 2019-02-04 stsp static const struct got_error *
3283 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3284 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3285 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3286 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3288 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3289 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3290 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3291 927df6b7 2019-02-10 stsp struct stat sb;
3292 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3293 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3294 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3296 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3298 98eaaa12 2019-08-03 stsp return err;
3300 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3301 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3302 98eaaa12 2019-08-03 stsp return NULL;
3304 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3305 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3306 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3308 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3309 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3310 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3312 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3313 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3314 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3315 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3316 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3319 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3320 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3323 927df6b7 2019-02-10 stsp static const struct got_error *
3324 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3325 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3327 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3328 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3329 f8d1f275 2019-02-04 stsp char *abspath;
3331 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3332 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3334 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3335 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3336 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3337 927df6b7 2019-02-10 stsp return NULL;
3339 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3340 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3341 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3342 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3344 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3345 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3346 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3349 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3350 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3351 f8d1f275 2019-02-04 stsp free(abspath);
3352 9d31a1d8 2018-03-11 stsp return err;
3355 f8d1f275 2019-02-04 stsp static const struct got_error *
3356 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3358 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3359 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3360 2ec1f75b 2019-03-26 stsp unsigned char status;
3362 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3363 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3365 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3366 927df6b7 2019-02-10 stsp return NULL;
3368 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3369 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3370 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3371 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3373 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3374 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3375 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3378 ef20f542 2022-06-26 thomas static void
3379 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3381 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3383 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3384 6841da00 2019-08-08 stsp free((char *)pe->path);
3385 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3388 ef20f542 2022-06-26 thomas static void
3389 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3391 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3393 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3394 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3395 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3396 6841da00 2019-08-08 stsp free((char *)pe->path);
3398 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3401 6841da00 2019-08-08 stsp static const struct got_error *
3402 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3404 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3405 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3406 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3407 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3408 6841da00 2019-08-08 stsp size_t linesize = 0;
3409 6841da00 2019-08-08 stsp ssize_t linelen;
3411 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3412 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3413 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3414 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3416 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3417 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3418 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3420 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3421 bd8de430 2019-10-04 stsp if (line[0] == '#')
3424 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3425 bd8de430 2019-10-04 stsp if (line[0] == '!')
3428 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3429 6841da00 2019-08-08 stsp line) == -1) {
3430 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3431 6841da00 2019-08-08 stsp goto done;
3433 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3435 6841da00 2019-08-08 stsp goto done;
3437 6841da00 2019-08-08 stsp if (ferror(f)) {
3438 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3439 6841da00 2019-08-08 stsp goto done;
3442 6841da00 2019-08-08 stsp dirpath = strdup(path);
3443 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3444 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3445 6841da00 2019-08-08 stsp goto done;
3447 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3449 6841da00 2019-08-08 stsp free(line);
3450 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3451 6841da00 2019-08-08 stsp free(dirpath);
3452 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3454 6841da00 2019-08-08 stsp return err;
3457 ef20f542 2022-06-26 thomas static int
3458 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3460 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3462 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3463 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3464 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3465 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3467 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3468 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3470 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3472 bd8de430 2019-10-04 stsp pattern += 3;
3474 bd8de430 2019-10-04 stsp while (*p) {
3475 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3476 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3477 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3478 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3480 bd8de430 2019-10-04 stsp while (*p == '/')
3490 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3491 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3492 6841da00 2019-08-08 stsp * ignores backwards.
3494 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3495 6841da00 2019-08-08 stsp while (pe) {
3496 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3497 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3498 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3499 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3500 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3501 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3502 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3503 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3504 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3509 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3515 6841da00 2019-08-08 stsp static const struct got_error *
3516 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3517 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3519 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3520 6841da00 2019-08-08 stsp char *ignorespath;
3521 886cec17 2019-12-15 stsp int fd = -1;
3522 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3524 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3525 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3526 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3528 886cec17 2019-12-15 stsp if (dirfd != -1) {
3529 fc63f50d 2021-12-31 thomas fd = openat(dirfd, ignores_filename,
3530 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3531 886cec17 2019-12-15 stsp if (fd == -1) {
3532 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3533 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3534 886cec17 2019-12-15 stsp ignorespath);
3536 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3537 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3538 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3539 886cec17 2019-12-15 stsp ignorespath);
3542 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3546 c56c5d8a 2021-12-31 thomas ignoresfile = fopen(ignorespath, "re");
3547 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3548 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3549 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3550 886cec17 2019-12-15 stsp ignorespath);
3552 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3555 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3556 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3557 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3558 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3559 6841da00 2019-08-08 stsp free(ignorespath);
3560 6841da00 2019-08-08 stsp return err;
3563 f8d1f275 2019-02-04 stsp static const struct got_error *
3564 6092c299 2021-10-04 thomas status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3565 6092c299 2021-10-04 thomas int dirfd)
3567 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3568 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3569 f8d1f275 2019-02-04 stsp char *path = NULL;
3571 6092c299 2021-10-04 thomas if (ignore != NULL)
3572 6092c299 2021-10-04 thomas *ignore = 0;
3574 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3575 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3577 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3578 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3579 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3581 f8d1f275 2019-02-04 stsp path = de->d_name;
3584 6092c299 2021-10-04 thomas if (de->d_type == DT_DIR) {
3585 6092c299 2021-10-04 thomas if (!a->no_ignores && ignore != NULL &&
3586 6092c299 2021-10-04 thomas match_ignores(a->ignores, path))
3587 6092c299 2021-10-04 thomas *ignore = 1;
3588 6092c299 2021-10-04 thomas } else if (!match_ignores(a->ignores, path) &&
3589 6092c299 2021-10-04 thomas got_path_is_child(path, a->status_path, a->status_path_len))
3590 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3591 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3592 f8d1f275 2019-02-04 stsp if (parent_path[0])
3593 f8d1f275 2019-02-04 stsp free(path);
3594 b72f483a 2019-02-05 stsp return err;
3597 347d1d3e 2019-07-12 stsp static const struct got_error *
3598 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3600 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3601 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3603 3143d852 2020-06-25 stsp if (a->no_ignores)
3604 3143d852 2020-06-25 stsp return NULL;
3606 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3607 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3609 3143d852 2020-06-25 stsp return err;
3611 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3612 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3614 3143d852 2020-06-25 stsp return err;
3617 3143d852 2020-06-25 stsp static const struct got_error *
3618 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3619 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3620 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3621 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3623 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3624 abb4604f 2019-07-27 stsp struct stat sb;
3626 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3628 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3629 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3631 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3632 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3633 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3634 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3635 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3638 fe1d8685 2022-02-12 thomas if (!no_ignores && match_ignores(ignores, path))
3639 fe1d8685 2022-02-12 thomas return NULL;
3641 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3642 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3643 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3645 abb4604f 2019-07-27 stsp return NULL;
3648 3143d852 2020-06-25 stsp static const struct got_error *
3649 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3650 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3652 3143d852 2020-06-25 stsp const struct got_error *err;
3653 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3655 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3656 3143d852 2020-06-25 stsp ".cvsignore");
3658 3143d852 2020-06-25 stsp return err;
3660 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3661 3143d852 2020-06-25 stsp ".gitignore");
3663 3143d852 2020-06-25 stsp return err;
3665 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3666 3143d852 2020-06-25 stsp if (err) {
3667 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3668 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3669 3143d852 2020-06-25 stsp return err;
3671 3143d852 2020-06-25 stsp for (;;) {
3672 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3673 3143d852 2020-06-25 stsp ".cvsignore");
3676 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3677 3143d852 2020-06-25 stsp ".gitignore");
3680 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3681 3143d852 2020-06-25 stsp if (err) {
3682 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3683 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3686 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3688 b737c85a 2020-06-26 stsp free(parent_path);
3689 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3690 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3693 b737c85a 2020-06-26 stsp free(parent_path);
3694 b737c85a 2020-06-26 stsp free(next_parent_path);
3695 3143d852 2020-06-25 stsp return err;
3698 abb4604f 2019-07-27 stsp static const struct got_error *
3699 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3700 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3701 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3702 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3703 f2a9dc41 2019-12-13 tracey int report_unchanged)
3705 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3706 6fc93f37 2019-12-13 stsp int fd = -1;
3707 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3708 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3709 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3710 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3711 a78810f8 2022-03-13 thomas struct got_fileindex_entry *ie;
3713 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3715 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3716 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3717 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3719 a78810f8 2022-03-13 thomas ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3720 a78810f8 2022-03-13 thomas if (ie) {
3721 a78810f8 2022-03-13 thomas err = report_single_file_status(path, ondisk_path,
3722 a78810f8 2022-03-13 thomas fileindex, status_cb, status_arg, repo,
3723 a78810f8 2022-03-13 thomas report_unchanged, &ignores, no_ignores);
3724 a78810f8 2022-03-13 thomas goto done;
3727 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3728 6fc93f37 2019-12-13 stsp if (fd == -1) {
3729 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3730 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
3731 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3733 ff56836b 2021-07-08 stsp if (!no_ignores) {
3734 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3735 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3737 ff56836b 2021-07-08 stsp goto done;
3739 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3740 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3741 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3744 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3745 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3746 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3747 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3748 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3749 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3750 abb4604f 2019-07-27 stsp arg.status_path = path;
3751 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3752 abb4604f 2019-07-27 stsp arg.repo = repo;
3753 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3754 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3755 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3756 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3757 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3758 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3759 022fae89 2019-12-06 tracey if (!no_ignores) {
3760 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3761 3143d852 2020-06-25 stsp worktree->root_path, path);
3763 3143d852 2020-06-25 stsp goto done;
3765 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3766 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3767 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3770 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3771 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3772 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3773 927df6b7 2019-02-10 stsp free(ondisk_path);
3774 347d1d3e 2019-07-12 stsp return err;
3777 347d1d3e 2019-07-12 stsp const struct got_error *
3778 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3779 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3780 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3781 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3783 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3784 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3785 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3786 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3788 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3790 347d1d3e 2019-07-12 stsp return err;
3792 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3793 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3794 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3795 f6343036 2021-06-22 stsp no_ignores, 0);
3799 f8d1f275 2019-02-04 stsp free(fileindex_path);
3800 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3801 f8d1f275 2019-02-04 stsp return err;
3804 6c7ab921 2019-03-18 stsp const struct got_error *
3805 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3806 6c7ab921 2019-03-18 stsp const char *arg)
3808 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3809 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3810 6c7ab921 2019-03-18 stsp size_t len;
3811 00bb5ea0 2020-07-23 stsp struct stat sb;
3812 01740607 2020-11-04 stsp char *abspath = NULL;
3813 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3815 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3817 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3818 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3819 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3821 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3822 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3823 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3824 00bb5ea0 2020-07-23 stsp goto done;
3826 727173c3 2020-11-06 stsp sb.st_mode = 0;
3828 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3830 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3831 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3832 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3833 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3835 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3836 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3837 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3838 00bb5ea0 2020-07-23 stsp goto done;
3842 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3843 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3845 d0710d08 2019-07-22 stsp goto done;
3846 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3847 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3848 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3849 00bb5ea0 2020-07-23 stsp goto done;
3852 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3853 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3854 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3855 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3856 00bb5ea0 2020-07-23 stsp goto done;
3858 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3859 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3860 01740607 2020-11-04 stsp goto done;
3862 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3863 01740607 2020-11-04 stsp sizeof(canonpath));
3865 00bb5ea0 2020-07-23 stsp goto done;
3866 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3867 01740607 2020-11-04 stsp if (resolved == NULL) {
3868 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3869 01740607 2020-11-04 stsp goto done;
3874 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3875 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3876 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3877 6c7ab921 2019-03-18 stsp goto done;
3880 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3881 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3882 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3884 f6d88e1a 2019-05-29 stsp goto done;
3886 f6d88e1a 2019-05-29 stsp path = strdup("");
3887 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3888 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3889 f6d88e1a 2019-05-29 stsp goto done;
3893 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3894 6c7ab921 2019-03-18 stsp len = strlen(path);
3895 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3896 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3900 01740607 2020-11-04 stsp free(abspath);
3901 6c7ab921 2019-03-18 stsp free(resolved);
3902 d0710d08 2019-07-22 stsp free(cwd);
3903 6c7ab921 2019-03-18 stsp if (err == NULL)
3904 6c7ab921 2019-03-18 stsp *wt_path = path;
3906 6c7ab921 2019-03-18 stsp free(path);
3907 d00136be 2019-03-26 stsp return err;
3910 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3911 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3912 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3913 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3914 4e68cba3 2019-11-23 stsp void *progress_arg;
3915 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3918 4e68cba3 2019-11-23 stsp static const struct got_error *
3919 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3920 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3921 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3922 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3924 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3925 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3926 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3927 6d022e97 2019-08-04 stsp struct stat sb;
3928 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3930 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3931 dbb83fbd 2019-12-12 stsp relpath) == -1)
3932 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3934 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3936 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3937 12463d8b 2019-12-13 stsp de_name, a->repo);
3939 dbb83fbd 2019-12-12 stsp goto done;
3940 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3941 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3942 dbb83fbd 2019-12-12 stsp goto done;
3943 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3945 dbb83fbd 2019-12-12 stsp goto done;
3948 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3949 84bf00a6 2022-02-12 thomas if (status == GOT_STATUS_NONEXISTENT)
3950 84bf00a6 2022-02-12 thomas err = got_error_set_errno(ENOENT, ondisk_path);
3952 84bf00a6 2022-02-12 thomas err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3953 dbb83fbd 2019-12-12 stsp goto done;
3956 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3958 4e68cba3 2019-11-23 stsp goto done;
3959 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3960 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3961 3969253a 2020-03-07 stsp if (err) {
3962 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3963 3969253a 2020-03-07 stsp goto done;
3965 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3966 07f5b47a 2019-06-02 stsp if (err) {
3967 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3968 4e68cba3 2019-11-23 stsp goto done;
3971 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3973 dbb83fbd 2019-12-12 stsp return err;
3974 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3975 dbb83fbd 2019-12-12 stsp return NULL;
3976 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3979 d00136be 2019-03-26 stsp const struct got_error *
3980 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3981 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3982 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3983 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3985 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3986 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3987 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3988 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3989 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3991 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3993 d00136be 2019-03-26 stsp return err;
3995 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3997 d00136be 2019-03-26 stsp goto done;
3999 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4000 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4001 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4002 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4003 4e68cba3 2019-11-23 stsp saa.repo = repo;
4005 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4006 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4007 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4011 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4012 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4013 af12c6b9 2019-06-04 stsp err = sync_err;
4015 fb399478 2019-07-12 stsp free(fileindex_path);
4016 d00136be 2019-03-26 stsp if (fileindex)
4017 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4018 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4019 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4020 d00136be 2019-03-26 stsp err = unlockerr;
4021 6c7ab921 2019-03-18 stsp return err;
4024 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4025 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4026 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4027 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4028 f2a9dc41 2019-12-13 tracey void *progress_arg;
4029 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4030 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4031 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4032 d64cc78a 2022-01-25 thomas int ignore_missing_paths;
4033 766841c2 2020-08-13 stsp const char *status_codes;
4036 f2a9dc41 2019-12-13 tracey static const struct got_error *
4037 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4038 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4039 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4040 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4042 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4043 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4044 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4045 17ed4618 2019-06-02 stsp struct stat sb;
4046 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4048 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_NONEXISTENT) {
4049 d64cc78a 2022-01-25 thomas if (a->ignore_missing_paths)
4050 d64cc78a 2022-01-25 thomas return NULL;
4051 d64cc78a 2022-01-25 thomas return got_error_set_errno(ENOENT, relpath);
4054 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4055 17ed4618 2019-06-02 stsp if (ie == NULL)
4056 d5a18ace 2022-01-25 thomas return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4058 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4059 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4060 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4061 9acbc4fa 2019-08-03 stsp return NULL;
4062 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4065 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4066 f2a9dc41 2019-12-13 tracey relpath) == -1)
4067 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4069 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4072 f2a9dc41 2019-12-13 tracey goto done;
4074 766841c2 2020-08-13 stsp if (a->status_codes) {
4075 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4077 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4078 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4081 766841c2 2020-08-13 stsp if (i == ncodes) {
4082 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4083 766841c2 2020-08-13 stsp free(ondisk_path);
4084 766841c2 2020-08-13 stsp return NULL;
4086 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4087 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4088 766841c2 2020-08-13 stsp static char msg[64];
4089 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4090 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4091 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4092 766841c2 2020-08-13 stsp goto done;
4096 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4097 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4098 f2a9dc41 2019-12-13 tracey goto done;
4099 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4100 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4101 f2a9dc41 2019-12-13 tracey goto done;
4103 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4104 d64cc78a 2022-01-25 thomas err = got_error_set_errno(ENOENT, relpath);
4105 d64cc78a 2022-01-25 thomas goto done;
4107 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4108 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4109 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4110 f2a9dc41 2019-12-13 tracey goto done;
4114 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4115 20a2ad1c 2020-10-20 stsp size_t root_len;
4117 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4118 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4119 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4120 12463d8b 2019-12-13 stsp ondisk_path);
4121 12463d8b 2019-12-13 stsp goto done;
4123 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4124 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4125 12463d8b 2019-12-13 stsp goto done;
4128 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4130 20a2ad1c 2020-10-20 stsp char *parent;
4131 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4133 2513f20a 2020-10-20 stsp goto done;
4134 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4135 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4136 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4137 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4138 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4139 20a2ad1c 2020-10-20 stsp ondisk_path);
4142 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4143 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4146 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4148 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4149 f2a9dc41 2019-12-13 tracey if (err)
4150 f2a9dc41 2019-12-13 tracey return err;
4151 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4152 f2a9dc41 2019-12-13 tracey return NULL;
4153 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4154 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4157 2ec1f75b 2019-03-26 stsp const struct got_error *
4158 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4159 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4160 766841c2 2020-08-13 stsp const char *status_codes,
4161 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4162 d64cc78a 2022-01-25 thomas struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4164 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4165 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4166 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4167 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4168 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4170 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4172 2ec1f75b 2019-03-26 stsp return err;
4174 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4176 2ec1f75b 2019-03-26 stsp goto done;
4178 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4179 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4180 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4181 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4182 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4183 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4184 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4185 d64cc78a 2022-01-25 thomas sda.ignore_missing_paths = ignore_missing_paths;
4186 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4188 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4189 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4190 6092c299 2021-10-04 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4194 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4195 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4196 af12c6b9 2019-06-04 stsp err = sync_err;
4198 fb399478 2019-07-12 stsp free(fileindex_path);
4199 2ec1f75b 2019-03-26 stsp if (fileindex)
4200 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4201 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4202 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4203 2ec1f75b 2019-03-26 stsp err = unlockerr;
4204 33aa809d 2019-08-08 stsp return err;
4207 33aa809d 2019-08-08 stsp static const struct got_error *
4208 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4210 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4211 33aa809d 2019-08-08 stsp char *line = NULL;
4212 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4213 33aa809d 2019-08-08 stsp ssize_t linelen;
4215 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4216 33aa809d 2019-08-08 stsp if (linelen == -1) {
4217 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4218 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4219 33aa809d 2019-08-08 stsp goto done;
4221 33aa809d 2019-08-08 stsp return NULL;
4223 33aa809d 2019-08-08 stsp if (outfile) {
4224 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4225 33aa809d 2019-08-08 stsp if (n != linelen) {
4226 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4227 33aa809d 2019-08-08 stsp goto done;
4230 33aa809d 2019-08-08 stsp if (rejectfile) {
4231 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4232 33aa809d 2019-08-08 stsp if (n != linelen)
4233 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4236 33aa809d 2019-08-08 stsp free(line);
4237 2ec1f75b 2019-03-26 stsp return err;
4240 33aa809d 2019-08-08 stsp static const struct got_error *
4241 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4243 33aa809d 2019-08-08 stsp char *line = NULL;
4244 33aa809d 2019-08-08 stsp size_t linesize = 0;
4245 33aa809d 2019-08-08 stsp ssize_t linelen;
4247 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4248 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4249 500467ff 2019-09-25 hiltjo if (ferror(f))
4250 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4251 500467ff 2019-09-25 hiltjo return NULL;
4253 33aa809d 2019-08-08 stsp free(line);
4254 33aa809d 2019-08-08 stsp return NULL;
4257 33aa809d 2019-08-08 stsp static const struct got_error *
4258 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4259 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4260 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4262 33aa809d 2019-08-08 stsp const struct got_error *err;
4264 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4265 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4266 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4268 33aa809d 2019-08-08 stsp return err;
4269 33aa809d 2019-08-08 stsp (*line_cur1)++;
4271 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4272 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4273 33aa809d 2019-08-08 stsp if (rejectfile)
4274 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4276 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4278 33aa809d 2019-08-08 stsp return err;
4279 33aa809d 2019-08-08 stsp (*line_cur2)++;
4281 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4282 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4283 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4285 33aa809d 2019-08-08 stsp return err;
4286 33aa809d 2019-08-08 stsp (*line_cur2)++;
4288 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4289 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4290 33aa809d 2019-08-08 stsp if (rejectfile)
4291 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4293 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4295 33aa809d 2019-08-08 stsp return err;
4296 33aa809d 2019-08-08 stsp (*line_cur1)++;
4299 f1e81a05 2019-08-10 stsp return NULL;
4302 f1e81a05 2019-08-10 stsp static const struct got_error *
4303 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4304 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4306 f1e81a05 2019-08-10 stsp const struct got_error *err;
4308 f1e81a05 2019-08-10 stsp if (outfile) {
4309 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4310 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4311 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4313 f1e81a05 2019-08-10 stsp return err;
4314 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4317 f1e81a05 2019-08-10 stsp if (rejectfile) {
4318 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4319 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4320 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4322 f1e81a05 2019-08-10 stsp return err;
4323 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4327 33aa809d 2019-08-08 stsp return NULL;
4330 33aa809d 2019-08-08 stsp static const struct got_error *
4331 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4332 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4333 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4334 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4335 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4337 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4338 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4339 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4340 33aa809d 2019-08-08 stsp FILE *hunkfile;
4341 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4342 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4345 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4347 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4348 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4349 fe621944 2020-11-10 stsp start_old = cc.left.start;
4350 fe621944 2020-11-10 stsp end_old = cc.left.end;
4351 fe621944 2020-11-10 stsp start_new = cc.right.start;
4352 fe621944 2020-11-10 stsp end_new = cc.right.end;
4354 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4355 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4356 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4358 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4359 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4360 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4362 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4363 fe621944 2020-11-10 stsp if (diff_state == NULL)
4364 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4365 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4367 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4368 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4369 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4370 33aa809d 2019-08-08 stsp goto done;
4373 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4374 fe621944 2020-11-10 stsp diff_result, &cc);
4375 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4376 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4377 33aa809d 2019-08-08 stsp goto done;
4380 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4381 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4382 33aa809d 2019-08-08 stsp goto done;
4385 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4386 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4388 33aa809d 2019-08-08 stsp goto done;
4390 33aa809d 2019-08-08 stsp switch (*choice) {
4391 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4392 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4393 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4395 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4396 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4397 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4399 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4402 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4406 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4407 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4408 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4409 33aa809d 2019-08-08 stsp return err;
4412 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4413 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4414 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4415 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4416 1f1abb7e 2019-08-08 stsp void *progress_arg;
4417 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4418 33aa809d 2019-08-08 stsp void *patch_arg;
4419 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4420 10604dce 2021-09-24 thomas int unlink_added_files;
4423 e20a8b6f 2019-06-04 stsp static const struct got_error *
4424 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4425 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4426 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4427 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4428 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4430 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4431 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4432 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4433 f4ae6ddb 2022-07-01 thomas int fd = -1, fd2 = -1;
4434 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4435 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4436 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4437 fe621944 2020-11-10 stsp struct stat sb2;
4438 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4439 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4440 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4442 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4444 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4446 33aa809d 2019-08-08 stsp return err;
4448 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4449 fc63f50d 2021-12-31 thomas fd2 = openat(dirfd2, de_name2,
4450 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4451 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4452 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4453 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4454 fa3cef63 2020-07-23 stsp goto done;
4456 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4457 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4458 48b4f239 2021-12-31 thomas if (link_len == -1) {
4459 48b4f239 2021-12-31 thomas return got_error_from_errno2("readlinkat",
4462 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4463 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4466 06340621 2021-12-31 thomas fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4467 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4468 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4469 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4470 fa3cef63 2020-07-23 stsp goto done;
4472 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4473 fa3cef63 2020-07-23 stsp sizeof(link_target));
4474 fa3cef63 2020-07-23 stsp if (link_len == -1)
4475 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4476 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4477 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4480 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4481 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4482 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4483 fa3cef63 2020-07-23 stsp goto done;
4486 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4487 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4488 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4489 fa3cef63 2020-07-23 stsp goto done;
4494 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4495 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4496 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4497 fa3cef63 2020-07-23 stsp goto done;
4499 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4500 fa3cef63 2020-07-23 stsp if (n != link_len) {
4501 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4502 fa3cef63 2020-07-23 stsp goto done;
4504 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4505 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4506 fa3cef63 2020-07-23 stsp goto done;
4508 fa3cef63 2020-07-23 stsp rewind(f2);
4511 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
4512 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
4513 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
4514 f4ae6ddb 2022-07-01 thomas goto done;
4517 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4519 33aa809d 2019-08-08 stsp goto done;
4521 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4523 33aa809d 2019-08-08 stsp goto done;
4525 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4527 33aa809d 2019-08-08 stsp goto done;
4529 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4532 33aa809d 2019-08-08 stsp goto done;
4534 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4536 33aa809d 2019-08-08 stsp goto done;
4538 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4539 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4540 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4541 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4543 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4544 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4545 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4546 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4547 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4548 fe621944 2020-11-10 stsp nchanges++;
4550 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4551 33aa809d 2019-08-08 stsp int choice;
4552 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4553 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4554 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4555 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4556 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4557 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4559 33aa809d 2019-08-08 stsp goto done;
4560 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4561 33aa809d 2019-08-08 stsp have_content = 1;
4562 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4565 1ebedb77 2019-10-19 stsp if (have_content) {
4566 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4567 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4568 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4570 1ebedb77 2019-10-19 stsp goto done;
4572 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4573 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4574 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4575 fa3cef63 2020-07-23 stsp goto done;
4580 33aa809d 2019-08-08 stsp free(id_str);
4581 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
4582 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
4584 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4585 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4586 fe621944 2020-11-10 stsp if (err == NULL)
4587 fe621944 2020-11-10 stsp err = free_err;
4588 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4589 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4590 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4591 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4592 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4593 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4594 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4595 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4596 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4597 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4598 33aa809d 2019-08-08 stsp if (err || !have_content) {
4599 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4600 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4601 33aa809d 2019-08-08 stsp free(*path_outfile);
4602 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4604 33aa809d 2019-08-08 stsp free(path1);
4605 33aa809d 2019-08-08 stsp return err;
4608 33aa809d 2019-08-08 stsp static const struct got_error *
4609 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4610 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4611 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4612 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4614 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4615 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4616 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4617 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4618 945f9229 2022-04-16 thomas struct got_commit_object *base_commit = NULL;
4619 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4620 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4621 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4622 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4623 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4624 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4625 f4ae6ddb 2022-07-01 thomas int fd = -1;
4627 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4628 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4629 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4630 d3bcc3d1 2019-08-08 stsp return NULL;
4632 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4633 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4634 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4636 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4637 65084dad 2019-08-08 stsp if (ie == NULL)
4638 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4640 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4641 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4642 a129376b 2019-03-28 stsp if (err) {
4643 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4644 a129376b 2019-03-28 stsp goto done;
4645 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4646 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4647 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4648 e20a8b6f 2019-06-04 stsp goto done;
4651 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4652 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4653 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4654 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4655 a129376b 2019-03-28 stsp goto done;
4658 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4659 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4660 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4661 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4662 a129376b 2019-03-28 stsp goto done;
4665 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4666 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4667 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4668 a129376b 2019-03-28 stsp goto done;
4673 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&base_commit, a->repo,
4674 945f9229 2022-04-16 thomas a->worktree->base_commit_id);
4675 945f9229 2022-04-16 thomas if (err)
4676 945f9229 2022-04-16 thomas goto done;
4678 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4679 a9fa2909 2019-07-27 stsp if (err) {
4680 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4681 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4682 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4683 a9fa2909 2019-07-27 stsp goto done;
4685 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4687 a9fa2909 2019-07-27 stsp goto done;
4689 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4691 a9fa2909 2019-07-27 stsp goto done;
4693 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4694 1233e6b6 2020-10-19 stsp free(te_name);
4695 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4696 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4697 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4698 a9fa2909 2019-07-27 stsp goto done;
4702 a129376b 2019-03-28 stsp switch (status) {
4703 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4704 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4705 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4706 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4707 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4709 33aa809d 2019-08-08 stsp goto done;
4710 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4713 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4714 1f1abb7e 2019-08-08 stsp ie->path);
4716 1ee397ad 2019-07-12 stsp goto done;
4717 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4718 10604dce 2021-09-24 thomas if (a->unlink_added_files) {
4719 10604dce 2021-09-24 thomas if (asprintf(&ondisk_path, "%s/%s",
4720 10604dce 2021-09-24 thomas got_worktree_get_root_path(a->worktree),
4721 10604dce 2021-09-24 thomas relpath) == -1) {
4722 10604dce 2021-09-24 thomas err = got_error_from_errno("asprintf");
4723 10604dce 2021-09-24 thomas goto done;
4725 10604dce 2021-09-24 thomas if (unlink(ondisk_path) == -1) {
4726 10604dce 2021-09-24 thomas err = got_error_from_errno2("unlink",
4727 10604dce 2021-09-24 thomas ondisk_path);
4732 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4733 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4734 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4735 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4736 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4738 33aa809d 2019-08-08 stsp goto done;
4739 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4742 33aa809d 2019-08-08 stsp /* fall through */
4743 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4744 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4745 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4746 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4747 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4748 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4749 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4750 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4751 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4753 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4754 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4755 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
4756 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
4757 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
4758 f4ae6ddb 2022-07-01 thomas goto done;
4761 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4763 65084dad 2019-08-08 stsp goto done;
4765 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4766 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4767 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4768 a129376b 2019-03-28 stsp goto done;
4771 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4772 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4773 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4774 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4775 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4776 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4777 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4779 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4780 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4781 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4782 369fd7e5 2020-07-23 stsp path_content);
4785 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4786 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4787 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4788 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4790 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4791 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4792 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4793 369fd7e5 2020-07-23 stsp goto done;
4797 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4798 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4799 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4800 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4801 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4802 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4804 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4806 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4807 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4808 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4809 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4812 a129376b 2019-03-28 stsp goto done;
4813 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4814 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4815 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4816 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4817 437adc9d 2020-12-10 yzhong blob->id.sha1,
4818 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4820 2e1fa222 2020-07-23 stsp goto done;
4822 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4823 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4824 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4833 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4834 33aa809d 2019-08-08 stsp free(path_content);
4835 e20a8b6f 2019-06-04 stsp free(parent_path);
4836 a129376b 2019-03-28 stsp free(tree_path);
4837 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
4838 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
4840 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4842 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4843 a129376b 2019-03-28 stsp free(tree_id);
4844 945f9229 2022-04-16 thomas if (base_commit)
4845 945f9229 2022-04-16 thomas got_object_commit_close(base_commit);
4846 e20a8b6f 2019-06-04 stsp return err;
4849 e20a8b6f 2019-06-04 stsp const struct got_error *
4850 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4851 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4852 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4853 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4854 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4856 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4857 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4858 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4859 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4860 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4861 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4863 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4865 e20a8b6f 2019-06-04 stsp return err;
4867 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4869 e20a8b6f 2019-06-04 stsp goto done;
4871 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4872 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4873 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4874 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4875 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4876 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4877 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4878 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
4879 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4880 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4881 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
4885 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4886 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4887 e20a8b6f 2019-06-04 stsp err = sync_err;
4889 fb399478 2019-07-12 stsp free(fileindex_path);
4890 a129376b 2019-03-28 stsp if (fileindex)
4891 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4892 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4893 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4894 a129376b 2019-03-28 stsp err = unlockerr;
4895 c4296144 2019-05-09 stsp return err;
4898 cf066bf8 2019-05-09 stsp static void
4899 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4901 24519714 2019-05-09 stsp free(ct->path);
4902 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4903 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4904 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4905 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4906 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4907 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4911 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4912 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4913 24519714 2019-05-09 stsp struct got_repository *repo;
4914 24519714 2019-05-09 stsp struct got_worktree *worktree;
4915 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4916 5f8a88c6 2019-08-03 stsp int have_staged_files;
4917 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4920 c4296144 2019-05-09 stsp static const struct got_error *
4921 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4922 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4923 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4924 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4926 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4927 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4928 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4929 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4930 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4931 768aea60 2019-05-09 stsp struct stat sb;
4933 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4934 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4935 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4936 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4937 5f8a88c6 2019-08-03 stsp return NULL;
4939 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4940 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4942 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4943 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4944 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4945 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4946 5f8a88c6 2019-08-03 stsp return NULL;
4949 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4950 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4951 036813ee 2019-05-09 stsp goto done;
4953 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4954 036813ee 2019-05-09 stsp parent_path = strdup("");
4955 69960a46 2019-05-09 stsp if (parent_path == NULL)
4956 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4958 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4960 69960a46 2019-05-09 stsp return err;
4963 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4964 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4965 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4966 c4296144 2019-05-09 stsp goto done;
4969 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4970 768aea60 2019-05-09 stsp relpath) == -1) {
4971 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4972 768aea60 2019-05-09 stsp goto done;
4975 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4976 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4977 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4978 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4979 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4980 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4981 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4982 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4984 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4985 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4988 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4989 0aeb8099 2020-07-23 stsp goto done;
4991 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4992 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4993 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4994 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4995 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4996 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4997 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4998 12463d8b 2019-12-13 stsp ct->ondisk_path);
4999 12463d8b 2019-12-13 stsp goto done;
5001 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
5002 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
5003 768aea60 2019-05-09 stsp goto done;
5005 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5008 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5009 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5010 44d03001 2019-05-09 stsp relpath) == -1) {
5011 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5012 44d03001 2019-05-09 stsp goto done;
5015 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5016 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5017 35213c7c 2020-07-23 stsp int is_bad_symlink;
5018 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5019 35213c7c 2020-07-23 stsp ssize_t target_len;
5020 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5021 35213c7c 2020-07-23 stsp sizeof(target_path));
5022 35213c7c 2020-07-23 stsp if (target_len == -1) {
5023 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5024 35213c7c 2020-07-23 stsp ct->ondisk_path);
5025 35213c7c 2020-07-23 stsp goto done;
5027 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5028 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5030 35213c7c 2020-07-23 stsp goto done;
5031 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5032 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5033 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5034 35213c7c 2020-07-23 stsp goto done;
5039 cf066bf8 2019-05-09 stsp ct->status = status;
5040 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5041 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5042 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5043 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5044 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5045 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5046 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5047 b416585c 2019-05-13 stsp goto done;
5049 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5050 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5051 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5052 f0b75401 2019-08-03 stsp goto done;
5055 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5056 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5057 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5058 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5059 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5060 036813ee 2019-05-09 stsp goto done;
5063 24519714 2019-05-09 stsp ct->path = strdup(path);
5064 24519714 2019-05-09 stsp if (ct->path == NULL) {
5065 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5066 24519714 2019-05-09 stsp goto done;
5068 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5070 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5071 ed175427 2019-05-09 stsp free_commitable(ct);
5072 24519714 2019-05-09 stsp free(parent_path);
5073 036813ee 2019-05-09 stsp free(path);
5074 a129376b 2019-03-28 stsp return err;
5077 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5078 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5079 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5080 036813ee 2019-05-09 stsp struct got_repository *);
5082 ed175427 2019-05-09 stsp static const struct got_error *
5083 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5084 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5085 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5086 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5087 afa376bf 2019-05-09 stsp struct got_repository *repo)
5089 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5090 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5091 036813ee 2019-05-09 stsp char *subpath;
5093 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5094 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5095 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5097 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5099 ed175427 2019-05-09 stsp return err;
5101 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5102 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5103 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5104 036813ee 2019-05-09 stsp free(subpath);
5105 036813ee 2019-05-09 stsp return err;
5108 036813ee 2019-05-09 stsp static const struct got_error *
5109 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5111 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5112 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5114 036813ee 2019-05-09 stsp *match = 0;
5116 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5117 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5118 0f63689d 2019-05-10 stsp return NULL;
5121 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5123 0f63689d 2019-05-10 stsp return err;
5124 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5125 036813ee 2019-05-09 stsp free(ct_parent_path);
5126 036813ee 2019-05-09 stsp return err;
5129 768aea60 2019-05-09 stsp static mode_t
5130 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5132 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5133 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5135 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5138 036813ee 2019-05-09 stsp static const struct got_error *
5139 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5140 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5142 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5144 036813ee 2019-05-09 stsp *new_te = NULL;
5146 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5148 036813ee 2019-05-09 stsp goto done;
5150 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5152 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5153 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5154 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5156 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5158 036813ee 2019-05-09 stsp if (err && *new_te) {
5159 56e0773d 2019-11-28 stsp free(*new_te);
5160 036813ee 2019-05-09 stsp *new_te = NULL;
5162 036813ee 2019-05-09 stsp return err;
5165 036813ee 2019-05-09 stsp static const struct got_error *
5166 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5167 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5169 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5170 102b254e 2020-10-19 stsp char *ct_name = NULL;
5172 036813ee 2019-05-09 stsp *new_te = NULL;
5174 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5175 036813ee 2019-05-09 stsp if (*new_te == NULL)
5176 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5178 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5180 036813ee 2019-05-09 stsp goto done;
5181 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5182 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5183 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5184 036813ee 2019-05-09 stsp goto done;
5187 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5189 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5190 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5191 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5193 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5195 102b254e 2020-10-19 stsp free(ct_name);
5196 036813ee 2019-05-09 stsp if (err && *new_te) {
5197 56e0773d 2019-11-28 stsp free(*new_te);
5198 036813ee 2019-05-09 stsp *new_te = NULL;
5200 036813ee 2019-05-09 stsp return err;
5203 036813ee 2019-05-09 stsp static const struct got_error *
5204 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5205 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5207 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5208 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5210 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5212 036813ee 2019-05-09 stsp return err;
5213 036813ee 2019-05-09 stsp if (new_pe == NULL)
5214 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5215 036813ee 2019-05-09 stsp return NULL;
5218 afa376bf 2019-05-09 stsp static const struct got_error *
5219 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5220 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5222 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5223 5f8a88c6 2019-08-03 stsp unsigned char status;
5225 ae1e948a 2021-09-28 thomas if (status_cb == NULL) /* no commit progress output desired */
5226 ae1e948a 2021-09-28 thomas return NULL;
5228 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5229 afa376bf 2019-05-09 stsp ct_path++;
5231 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5232 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5234 5f8a88c6 2019-08-03 stsp status = ct->status;
5236 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5237 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5240 036813ee 2019-05-09 stsp static const struct got_error *
5241 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5242 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5244 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5245 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5246 44d03001 2019-05-09 stsp char *te_path;
5248 44d03001 2019-05-09 stsp *modified = 0;
5250 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5251 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5252 44d03001 2019-05-09 stsp te->name) == -1)
5253 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5255 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5256 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5257 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5258 44d03001 2019-05-09 stsp strlen(te_path));
5259 62d463ca 2020-10-20 naddy if (*modified)
5263 44d03001 2019-05-09 stsp free(te_path);
5264 44d03001 2019-05-09 stsp return err;
5267 44d03001 2019-05-09 stsp static const struct got_error *
5268 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5269 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5270 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5272 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5273 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5275 036813ee 2019-05-09 stsp *ctp = NULL;
5277 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5278 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5279 036813ee 2019-05-09 stsp char *ct_name = NULL;
5280 036813ee 2019-05-09 stsp int path_matches;
5282 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5283 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5284 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5285 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5288 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5289 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5293 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5296 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5298 036813ee 2019-05-09 stsp return err;
5299 036813ee 2019-05-09 stsp if (!path_matches)
5302 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5304 d34b633e 2020-10-19 stsp return err;
5306 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5307 d34b633e 2020-10-19 stsp free(ct_name);
5310 d34b633e 2020-10-19 stsp free(ct_name);
5312 036813ee 2019-05-09 stsp *ctp = ct;
5316 2b496619 2019-07-10 stsp return err;
5319 2b496619 2019-07-10 stsp static const struct got_error *
5320 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5321 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5322 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5323 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5324 2b496619 2019-07-10 stsp struct got_repository *repo)
5326 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5327 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5328 2b496619 2019-07-10 stsp char *subtree_path;
5329 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5330 ba580f68 2020-03-22 stsp int nentries;
5332 2b496619 2019-07-10 stsp *new_tep = NULL;
5334 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5335 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5336 2b496619 2019-07-10 stsp child_path) == -1)
5337 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5339 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5340 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5341 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5342 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5344 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5345 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5346 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5347 2b496619 2019-07-10 stsp goto done;
5349 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5350 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5351 2b496619 2019-07-10 stsp if (err) {
5352 56e0773d 2019-11-28 stsp free(new_te);
5353 2b496619 2019-07-10 stsp goto done;
5355 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5358 2b496619 2019-07-10 stsp free(subtree_path);
5359 2b496619 2019-07-10 stsp if (err == NULL)
5360 2b496619 2019-07-10 stsp *new_tep = new_te;
5361 036813ee 2019-05-09 stsp return err;
5364 036813ee 2019-05-09 stsp static const struct got_error *
5365 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5366 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5367 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5368 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5369 036813ee 2019-05-09 stsp struct got_repository *repo)
5371 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5372 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5373 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5374 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5376 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5377 ba580f68 2020-03-22 stsp *nentries = 0;
5379 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5380 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5381 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5382 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5384 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5385 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5386 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5389 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5390 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5393 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5394 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5396 036813ee 2019-05-09 stsp goto done;
5398 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5399 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5400 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5402 036813ee 2019-05-09 stsp goto done;
5403 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5405 afa376bf 2019-05-09 stsp goto done;
5406 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5407 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5409 2f51b5b3 2019-05-09 stsp goto done;
5410 ba580f68 2020-03-22 stsp (*nentries)++;
5412 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5413 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5414 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5415 2b496619 2019-07-10 stsp == NULL) {
5416 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5417 2b496619 2019-07-10 stsp child_path, path_base_tree,
5418 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5421 2b496619 2019-07-10 stsp goto done;
5422 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5424 2b496619 2019-07-10 stsp goto done;
5425 ba580f68 2020-03-22 stsp (*nentries)++;
5430 2f51b5b3 2019-05-09 stsp if (base_tree) {
5431 56e0773d 2019-11-28 stsp int i, nbase_entries;
5432 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5433 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5434 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5435 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5437 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5438 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5439 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5440 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5442 63c5ca5d 2019-08-24 stsp goto done;
5443 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5445 63c5ca5d 2019-08-24 stsp goto done;
5446 ba580f68 2020-03-22 stsp (*nentries)++;
5450 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5451 44d03001 2019-05-09 stsp int modified;
5452 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5454 036813ee 2019-05-09 stsp goto done;
5455 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5456 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5458 2f51b5b3 2019-05-09 stsp goto done;
5459 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5460 44d03001 2019-05-09 stsp if (modified) {
5461 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5462 ba580f68 2020-03-22 stsp int nsubentries;
5463 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5464 ba580f68 2020-03-22 stsp &nsubentries, te,
5465 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5466 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5468 44d03001 2019-05-09 stsp goto done;
5469 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5470 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5471 ba580f68 2020-03-22 stsp free(new_id);
5474 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5475 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5476 56e0773d 2019-11-28 stsp free(new_id);
5478 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5480 036813ee 2019-05-09 stsp goto done;
5481 ba580f68 2020-03-22 stsp (*nentries)++;
5485 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5486 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5488 f66c734c 2019-09-22 stsp goto done;
5490 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5491 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5492 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5493 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5494 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5495 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5497 2f51b5b3 2019-05-09 stsp goto done;
5498 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5500 2f51b5b3 2019-05-09 stsp goto done;
5501 ba580f68 2020-03-22 stsp (*nentries)++;
5503 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5504 b416585c 2019-05-13 stsp status_arg);
5506 afa376bf 2019-05-09 stsp goto done;
5508 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5509 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5511 2f51b5b3 2019-05-09 stsp goto done;
5512 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5514 2f51b5b3 2019-05-09 stsp goto done;
5515 ba580f68 2020-03-22 stsp (*nentries)++;
5520 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5521 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5523 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5524 2e1fa222 2020-07-23 stsp return err;
5527 2e1fa222 2020-07-23 stsp static const struct got_error *
5528 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5529 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5530 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5531 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5533 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5534 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5535 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5537 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5538 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5539 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5541 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5543 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5544 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5545 437adc9d 2020-12-10 yzhong if (err)
5546 437adc9d 2020-12-10 yzhong goto done;
5549 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5550 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5551 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5552 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5553 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5554 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5555 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5556 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5558 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5559 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5560 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5561 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5562 72fd46fa 2019-09-06 stsp !have_staged_files);
5564 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5565 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5566 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5567 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5568 72fd46fa 2019-09-06 stsp !have_staged_files);
5570 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5572 437adc9d 2020-12-10 yzhong goto done;
5573 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5574 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5575 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5576 3969253a 2020-03-07 stsp if (err) {
5577 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5578 437adc9d 2020-12-10 yzhong goto done;
5580 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5581 3969253a 2020-03-07 stsp if (err) {
5582 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5583 437adc9d 2020-12-10 yzhong goto done;
5586 437adc9d 2020-12-10 yzhong free(relpath);
5587 437adc9d 2020-12-10 yzhong relpath = NULL;
5590 437adc9d 2020-12-10 yzhong free(relpath);
5591 d56d26ce 2019-05-10 stsp return err;
5595 d56d26ce 2019-05-10 stsp static const struct got_error *
5596 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5597 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5598 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5599 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5600 735ef5ac 2019-08-03 stsp int ood_errcode)
5602 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5603 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
5604 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5606 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5607 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5608 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5609 1a36436d 2019-06-10 stsp return NULL;
5611 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5612 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5614 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, head_commit_id);
5615 945f9229 2022-04-16 thomas if (err)
5616 945f9229 2022-04-16 thomas goto done;
5617 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5618 9bead371 2019-07-28 stsp if (err) {
5619 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5620 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5621 1a36436d 2019-06-10 stsp goto done;
5622 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5623 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5625 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5626 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, head_commit_id);
5627 945f9229 2022-04-16 thomas if (err)
5628 945f9229 2022-04-16 thomas goto done;
5629 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5630 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5631 1a36436d 2019-06-10 stsp goto done;
5632 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5636 945f9229 2022-04-16 thomas if (commit)
5637 945f9229 2022-04-16 thomas got_object_commit_close(commit);
5638 1a36436d 2019-06-10 stsp return err;
5641 ef20f542 2022-06-26 thomas static const struct got_error *
5642 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5643 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5644 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id,
5645 10604dce 2021-09-24 thomas struct got_object_id *parent_id2,
5646 10604dce 2021-09-24 thomas struct got_worktree *worktree,
5647 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5648 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5649 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5650 afa376bf 2019-05-09 stsp struct got_repository *repo)
5652 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5653 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5654 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5655 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5656 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5657 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5658 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5659 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5660 10604dce 2021-09-24 thomas int nentries, nparents = 0;
5661 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5662 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5663 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5665 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5667 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5669 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5671 588edf97 2019-05-10 stsp goto done;
5673 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5675 588edf97 2019-05-10 stsp goto done;
5677 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5678 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5683 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5684 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5688 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5689 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5690 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5691 cf066bf8 2019-05-09 stsp char *ondisk_path;
5693 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5694 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5695 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5698 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5699 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5700 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5703 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5704 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5705 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5706 cf066bf8 2019-05-09 stsp goto done;
5708 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5709 2e1fa222 2020-07-23 stsp free(ondisk_path);
5711 cf066bf8 2019-05-09 stsp goto done;
5714 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5715 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5716 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5718 036813ee 2019-05-09 stsp goto done;
5720 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5722 de18fc63 2019-05-09 stsp goto done;
5723 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5724 10604dce 2021-09-24 thomas nparents++;
5725 10604dce 2021-09-24 thomas if (parent_id2) {
5726 10604dce 2021-09-24 thomas err = got_object_qid_alloc(&pid, parent_id2);
5727 10604dce 2021-09-24 thomas if (err)
5728 10604dce 2021-09-24 thomas goto done;
5729 10604dce 2021-09-24 thomas STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5730 10604dce 2021-09-24 thomas nparents++;
5732 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5733 10604dce 2021-09-24 thomas nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5734 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5735 33ad4cbe 2019-05-12 jcs free(logmsg);
5737 9d40349a 2019-05-09 stsp goto done;
5739 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5740 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5741 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5742 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5743 09f5bd90 2019-05-09 stsp goto done;
5745 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5746 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5748 09f5bd90 2019-05-09 stsp goto done;
5749 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5751 ebf99748 2019-05-09 stsp goto done;
5752 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5753 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5754 09f5bd90 2019-05-09 stsp goto done;
5756 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5757 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5759 f2c16586 2019-05-09 stsp goto done;
5760 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5762 f2c16586 2019-05-09 stsp goto done;
5764 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5766 09f5bd90 2019-05-09 stsp goto done;
5768 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5770 ebf99748 2019-05-09 stsp goto done;
5772 10604dce 2021-09-24 thomas got_object_id_queue_free(&parent_ids);
5773 588edf97 2019-05-10 stsp if (head_tree)
5774 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5775 588edf97 2019-05-10 stsp if (head_commit)
5776 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5777 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5778 2f17228e 2019-05-12 stsp if (head_ref2) {
5779 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5780 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5781 2f17228e 2019-05-12 stsp err = unlockerr;
5782 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5784 39cd0ff6 2019-07-12 stsp return err;
5787 5c1e53bc 2019-07-28 stsp static const struct got_error *
5788 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5789 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5791 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5792 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5794 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5795 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5796 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5798 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5799 5c1e53bc 2019-07-28 stsp ct_path++;
5801 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5802 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5806 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5807 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5809 5c1e53bc 2019-07-28 stsp return NULL;
5812 f0b75401 2019-08-03 stsp static const struct got_error *
5813 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5815 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5817 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5818 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5819 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5822 f0b75401 2019-08-03 stsp return NULL;
5825 5f8a88c6 2019-08-03 stsp static const struct got_error *
5826 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5827 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5829 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5830 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5832 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5833 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5835 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5836 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5837 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5838 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5839 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5840 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5843 5f8a88c6 2019-08-03 stsp return NULL;
5846 39cd0ff6 2019-07-12 stsp const struct got_error *
5847 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5848 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5849 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5850 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5851 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5852 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5854 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5855 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5856 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5857 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5858 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5859 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5860 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5861 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5862 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5864 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5866 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5868 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5870 39cd0ff6 2019-07-12 stsp goto done;
5872 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5874 39cd0ff6 2019-07-12 stsp goto done;
5876 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5878 39cd0ff6 2019-07-12 stsp goto done;
5880 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5882 39cd0ff6 2019-07-12 stsp goto done;
5884 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5885 5f8a88c6 2019-08-03 stsp &have_staged_files);
5886 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5887 5f8a88c6 2019-08-03 stsp goto done;
5888 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5889 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5891 5f8a88c6 2019-08-03 stsp goto done;
5894 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5895 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5896 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5897 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5898 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5899 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5900 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5901 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5902 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
5904 5c1e53bc 2019-07-28 stsp goto done;
5907 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5908 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5909 39cd0ff6 2019-07-12 stsp goto done;
5912 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5913 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5915 5c1e53bc 2019-07-28 stsp goto done;
5918 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5919 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5920 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5922 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5923 f0b75401 2019-08-03 stsp ct_path++;
5924 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5925 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5926 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5928 b50cabdf 2019-07-12 stsp goto done;
5932 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5933 10604dce 2021-09-24 thomas head_commit_id, NULL, worktree, author, committer,
5934 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5936 39cd0ff6 2019-07-12 stsp goto done;
5938 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5939 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5940 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5941 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5942 39cd0ff6 2019-07-12 stsp err = sync_err;
5944 39cd0ff6 2019-07-12 stsp if (fileindex)
5945 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5946 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5947 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5948 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5949 39cd0ff6 2019-07-12 stsp err = unlockerr;
5950 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5951 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5952 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5954 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5955 c4296144 2019-05-09 stsp return err;
5958 8656d6c4 2019-05-20 stsp const char *
5959 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5961 8656d6c4 2019-05-20 stsp return ct->path;
5964 8656d6c4 2019-05-20 stsp unsigned int
5965 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5967 8656d6c4 2019-05-20 stsp return ct->status;
5970 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5971 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5972 818c7501 2019-07-11 stsp struct got_repository *repo;
5975 818c7501 2019-07-11 stsp static const struct got_error *
5976 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5978 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5979 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5980 818c7501 2019-07-11 stsp unsigned char status;
5981 818c7501 2019-07-11 stsp struct stat sb;
5982 818c7501 2019-07-11 stsp char *ondisk_path;
5984 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5985 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5986 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5987 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5989 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5991 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5993 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5994 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5995 818c7501 2019-07-11 stsp free(ondisk_path);
5997 818c7501 2019-07-11 stsp return err;
5999 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
6000 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
6001 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6002 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6004 818c7501 2019-07-11 stsp return NULL;
6007 818c7501 2019-07-11 stsp const struct got_error *
6008 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6009 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6010 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
6011 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6013 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6014 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6015 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6016 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6017 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6018 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6019 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6021 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6022 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6023 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6025 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6027 818c7501 2019-07-11 stsp return err;
6029 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6031 818c7501 2019-07-11 stsp goto done;
6033 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6034 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6035 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6038 818c7501 2019-07-11 stsp goto done;
6040 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6042 818c7501 2019-07-11 stsp goto done;
6044 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6046 818c7501 2019-07-11 stsp goto done;
6048 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6050 818c7501 2019-07-11 stsp goto done;
6052 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6055 e51d7b55 2020-01-04 stsp goto done;
6057 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6059 818c7501 2019-07-11 stsp goto done;
6060 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6061 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6062 e51d7b55 2020-01-04 stsp goto done;
6065 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6066 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6068 818c7501 2019-07-11 stsp goto done;
6069 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6071 818c7501 2019-07-11 stsp goto done;
6073 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6075 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6077 818c7501 2019-07-11 stsp goto done;
6079 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6081 818c7501 2019-07-11 stsp goto done;
6083 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6084 818c7501 2019-07-11 stsp worktree->base_commit_id);
6086 818c7501 2019-07-11 stsp goto done;
6087 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6089 818c7501 2019-07-11 stsp goto done;
6091 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6093 818c7501 2019-07-11 stsp goto done;
6095 818c7501 2019-07-11 stsp free(fileindex_path);
6096 818c7501 2019-07-11 stsp free(tmp_branch_name);
6097 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6098 818c7501 2019-07-11 stsp free(branch_ref_name);
6099 818c7501 2019-07-11 stsp if (branch_ref)
6100 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6101 818c7501 2019-07-11 stsp if (wt_branch)
6102 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6103 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6104 818c7501 2019-07-11 stsp if (err) {
6105 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6106 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6107 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6109 818c7501 2019-07-11 stsp if (*tmp_branch) {
6110 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6111 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6113 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6114 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6115 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6117 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6119 818c7501 2019-07-11 stsp return err;
6122 818c7501 2019-07-11 stsp const struct got_error *
6123 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6124 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6125 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6126 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6128 818c7501 2019-07-11 stsp const struct got_error *err;
6129 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6130 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6131 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6132 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6133 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6135 818c7501 2019-07-11 stsp *commit_id = NULL;
6136 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6137 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6138 3e3a69f1 2019-07-25 stsp *branch = NULL;
6139 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6141 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6143 3e3a69f1 2019-07-25 stsp return err;
6145 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6147 f032f1f7 2019-08-04 stsp goto done;
6149 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6150 f032f1f7 2019-08-04 stsp &have_staged_files);
6151 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6152 f032f1f7 2019-08-04 stsp goto done;
6153 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6154 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6155 3e3a69f1 2019-07-25 stsp goto done;
6158 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6160 f032f1f7 2019-08-04 stsp goto done;
6162 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6164 818c7501 2019-07-11 stsp goto done;
6166 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6168 818c7501 2019-07-11 stsp goto done;
6170 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6172 818c7501 2019-07-11 stsp goto done;
6174 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6176 818c7501 2019-07-11 stsp goto done;
6178 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6179 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6181 818c7501 2019-07-11 stsp goto done;
6183 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6185 818c7501 2019-07-11 stsp goto done;
6187 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6189 818c7501 2019-07-11 stsp goto done;
6191 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6192 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6194 818c7501 2019-07-11 stsp goto done;
6196 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6198 818c7501 2019-07-11 stsp goto done;
6200 818c7501 2019-07-11 stsp free(commit_ref_name);
6201 818c7501 2019-07-11 stsp free(branch_ref_name);
6202 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6203 818c7501 2019-07-11 stsp if (commit_ref)
6204 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6205 818c7501 2019-07-11 stsp if (branch_ref)
6206 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6207 818c7501 2019-07-11 stsp if (err) {
6208 818c7501 2019-07-11 stsp free(*commit_id);
6209 818c7501 2019-07-11 stsp *commit_id = NULL;
6210 818c7501 2019-07-11 stsp if (*tmp_branch) {
6211 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6212 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6214 818c7501 2019-07-11 stsp if (*new_base_branch) {
6215 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6216 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6218 818c7501 2019-07-11 stsp if (*branch) {
6219 818c7501 2019-07-11 stsp got_ref_close(*branch);
6220 818c7501 2019-07-11 stsp *branch = NULL;
6222 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6223 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6224 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6226 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6228 818c7501 2019-07-11 stsp return err;
6231 818c7501 2019-07-11 stsp const struct got_error *
6232 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6234 818c7501 2019-07-11 stsp const struct got_error *err;
6235 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6237 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6239 818c7501 2019-07-11 stsp return err;
6241 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6242 818c7501 2019-07-11 stsp free(tmp_branch_name);
6243 818c7501 2019-07-11 stsp return NULL;
6246 818c7501 2019-07-11 stsp static const struct got_error *
6247 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6248 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6250 0ebf8283 2019-07-24 stsp *logmsg = arg;
6251 818c7501 2019-07-11 stsp return NULL;
6254 818c7501 2019-07-11 stsp static const struct got_error *
6255 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6256 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6257 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6258 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6260 818c7501 2019-07-11 stsp return NULL;
6263 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6264 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6265 01757395 2019-07-12 stsp void *progress_arg;
6266 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6269 01757395 2019-07-12 stsp static const struct got_error *
6270 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6272 01757395 2019-07-12 stsp const struct got_error *err;
6273 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6275 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6277 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6279 01757395 2019-07-12 stsp return err;
6281 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6282 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6283 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6284 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6285 01757395 2019-07-12 stsp return NULL;
6287 01757395 2019-07-12 stsp p = strdup(path);
6288 01757395 2019-07-12 stsp if (p == NULL)
6289 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6291 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6292 01757395 2019-07-12 stsp if (err || new == NULL)
6294 01757395 2019-07-12 stsp return err;
6298 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6300 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6302 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6303 01757395 2019-07-12 stsp free((char *)pe->path);
6305 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6308 0ebf8283 2019-07-24 stsp static const struct got_error *
6309 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6310 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6312 818c7501 2019-07-11 stsp const struct got_error *err;
6313 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6315 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6316 818c7501 2019-07-11 stsp if (err) {
6317 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6318 818c7501 2019-07-11 stsp goto done;
6319 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6321 818c7501 2019-07-11 stsp goto done;
6322 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6324 818c7501 2019-07-11 stsp goto done;
6325 de05890f 2020-03-05 stsp } else if (is_rebase) {
6326 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6329 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6331 818c7501 2019-07-11 stsp goto done;
6332 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6333 818c7501 2019-07-11 stsp free(stored_id);
6334 818c7501 2019-07-11 stsp if (cmp != 0) {
6335 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6336 818c7501 2019-07-11 stsp goto done;
6340 0ebf8283 2019-07-24 stsp if (commit_ref)
6341 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6342 0ebf8283 2019-07-24 stsp return err;
6345 0ebf8283 2019-07-24 stsp static const struct got_error *
6346 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6347 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6348 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6349 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6350 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6351 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6353 0ebf8283 2019-07-24 stsp const struct got_error *err;
6354 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6355 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6356 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6358 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6360 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6362 0ebf8283 2019-07-24 stsp return err;
6364 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6365 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6366 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6367 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6368 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6369 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6370 818c7501 2019-07-11 stsp if (commit_ref)
6371 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6372 818c7501 2019-07-11 stsp return err;
6375 818c7501 2019-07-11 stsp const struct got_error *
6376 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6377 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6378 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6379 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6380 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6381 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6383 0ebf8283 2019-07-24 stsp const struct got_error *err;
6384 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6386 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6388 0ebf8283 2019-07-24 stsp return err;
6390 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6392 0ebf8283 2019-07-24 stsp goto done;
6394 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6395 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6396 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6398 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6399 0ebf8283 2019-07-24 stsp return err;
6402 0ebf8283 2019-07-24 stsp const struct got_error *
6403 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6404 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6405 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6406 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6407 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6408 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6410 0ebf8283 2019-07-24 stsp const struct got_error *err;
6411 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6413 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6415 0ebf8283 2019-07-24 stsp return err;
6417 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6419 0ebf8283 2019-07-24 stsp goto done;
6421 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6422 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6423 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6425 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6426 0ebf8283 2019-07-24 stsp return err;
6429 0ebf8283 2019-07-24 stsp static const struct got_error *
6430 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6431 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6432 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6433 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6434 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6436 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6437 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6438 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6439 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6440 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6441 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6442 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6444 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6445 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6447 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6449 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6451 3e3a69f1 2019-07-25 stsp return err;
6453 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6454 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6455 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6456 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6458 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6459 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6461 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6462 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6463 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6464 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6465 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6466 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6468 01757395 2019-07-12 stsp if (merged_paths) {
6469 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6470 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6471 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6472 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6475 01757395 2019-07-12 stsp goto done;
6478 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6479 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6481 01757395 2019-07-12 stsp goto done;
6484 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6485 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6486 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6488 a0e95631 2019-07-12 stsp goto done;
6489 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6490 a0e95631 2019-07-12 stsp goto done;
6493 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6495 edd02c5e 2019-07-11 stsp goto done;
6497 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6499 818c7501 2019-07-11 stsp goto done;
6501 5943eee2 2019-08-13 stsp if (new_logmsg) {
6502 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6503 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6504 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6505 5943eee2 2019-08-13 stsp goto done;
6508 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6510 5943eee2 2019-08-13 stsp goto done;
6513 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6514 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6515 10604dce 2021-09-24 thomas NULL, worktree, got_object_commit_get_author(orig_commit),
6516 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6517 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6519 a0e95631 2019-07-12 stsp goto done;
6521 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6523 a0e95631 2019-07-12 stsp goto done;
6525 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6527 a0e95631 2019-07-12 stsp goto done;
6529 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6530 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6531 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6532 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6533 a0e95631 2019-07-12 stsp err = sync_err;
6535 a0e95631 2019-07-12 stsp free(fileindex_path);
6536 a0e95631 2019-07-12 stsp free(head_commit_id);
6537 a0e95631 2019-07-12 stsp if (head_ref)
6538 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6539 818c7501 2019-07-11 stsp if (err) {
6540 818c7501 2019-07-11 stsp free(*new_commit_id);
6541 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6543 818c7501 2019-07-11 stsp return err;
6546 818c7501 2019-07-11 stsp const struct got_error *
6547 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6548 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6549 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6550 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6551 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6553 0ebf8283 2019-07-24 stsp const struct got_error *err;
6554 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6555 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6556 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6558 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6560 0ebf8283 2019-07-24 stsp return err;
6562 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6564 0ebf8283 2019-07-24 stsp goto done;
6565 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6567 0ebf8283 2019-07-24 stsp goto done;
6568 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6569 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6570 0ebf8283 2019-07-24 stsp goto done;
6573 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6574 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6576 0ebf8283 2019-07-24 stsp if (commit_ref)
6577 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6578 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6579 0ebf8283 2019-07-24 stsp free(commit_id);
6580 0ebf8283 2019-07-24 stsp return err;
6583 0ebf8283 2019-07-24 stsp const struct got_error *
6584 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6585 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6586 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6587 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6588 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6589 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6591 0ebf8283 2019-07-24 stsp const struct got_error *err;
6592 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6593 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6595 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6597 0ebf8283 2019-07-24 stsp return err;
6599 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6601 0ebf8283 2019-07-24 stsp goto done;
6603 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6604 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6606 0ebf8283 2019-07-24 stsp if (commit_ref)
6607 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6608 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6609 0ebf8283 2019-07-24 stsp return err;
6612 0ebf8283 2019-07-24 stsp const struct got_error *
6613 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6614 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6616 3e3a69f1 2019-07-25 stsp if (fileindex)
6617 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6618 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6621 69844fba 2019-07-11 stsp static const struct got_error *
6622 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6624 69844fba 2019-07-11 stsp const struct got_error *err;
6625 69844fba 2019-07-11 stsp struct got_reference *ref;
6627 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6628 69844fba 2019-07-11 stsp if (err) {
6629 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6630 69844fba 2019-07-11 stsp return NULL;
6631 69844fba 2019-07-11 stsp return err;
6634 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6635 69844fba 2019-07-11 stsp got_ref_close(ref);
6636 69844fba 2019-07-11 stsp return err;
6639 69844fba 2019-07-11 stsp static const struct got_error *
6640 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6642 69844fba 2019-07-11 stsp const struct got_error *err;
6643 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6644 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6646 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6648 69844fba 2019-07-11 stsp goto done;
6649 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6651 69844fba 2019-07-11 stsp goto done;
6653 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6655 69844fba 2019-07-11 stsp goto done;
6656 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6658 69844fba 2019-07-11 stsp goto done;
6660 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6662 69844fba 2019-07-11 stsp goto done;
6663 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6665 69844fba 2019-07-11 stsp goto done;
6667 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6669 69844fba 2019-07-11 stsp goto done;
6670 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6672 69844fba 2019-07-11 stsp goto done;
6675 69844fba 2019-07-11 stsp free(tmp_branch_name);
6676 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6677 69844fba 2019-07-11 stsp free(branch_ref_name);
6678 69844fba 2019-07-11 stsp free(commit_ref_name);
6679 e600f124 2021-03-21 stsp return err;
6682 ef20f542 2022-06-26 thomas static const struct got_error *
6683 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6684 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6686 e600f124 2021-03-21 stsp const struct got_error *err;
6687 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6688 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6689 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6690 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6691 e600f124 2021-03-21 stsp char *refname = NULL;
6693 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6694 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6695 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6696 e600f124 2021-03-21 stsp branch_name += 11;
6698 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6700 e600f124 2021-03-21 stsp return err;
6702 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6703 e600f124 2021-03-21 stsp new_id_str) == -1) {
6704 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6705 e600f124 2021-03-21 stsp goto done;
6708 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6710 e600f124 2021-03-21 stsp goto done;
6712 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6714 e600f124 2021-03-21 stsp goto done;
6716 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6718 e600f124 2021-03-21 stsp free(new_id_str);
6719 e600f124 2021-03-21 stsp free(refname);
6720 e600f124 2021-03-21 stsp free(old_commit_id);
6722 e600f124 2021-03-21 stsp got_ref_close(ref);
6723 69844fba 2019-07-11 stsp return err;
6726 818c7501 2019-07-11 stsp const struct got_error *
6727 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6728 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6729 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6730 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6732 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6733 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6734 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6736 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6738 818c7501 2019-07-11 stsp return err;
6740 e600f124 2021-03-21 stsp if (create_backup) {
6741 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6742 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6744 e600f124 2021-03-21 stsp goto done;
6747 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6749 818c7501 2019-07-11 stsp goto done;
6751 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6753 818c7501 2019-07-11 stsp goto done;
6755 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6757 818c7501 2019-07-11 stsp goto done;
6759 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6761 a615e0e7 2020-12-16 stsp goto done;
6763 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6765 a615e0e7 2020-12-16 stsp goto done;
6766 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6767 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6768 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6769 a615e0e7 2020-12-16 stsp err = sync_err;
6771 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6772 a615e0e7 2020-12-16 stsp free(fileindex_path);
6773 818c7501 2019-07-11 stsp free(new_head_commit_id);
6774 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6775 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6776 818c7501 2019-07-11 stsp err = unlockerr;
6777 818c7501 2019-07-11 stsp return err;
6780 818c7501 2019-07-11 stsp const struct got_error *
6781 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6782 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6783 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6784 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6786 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6787 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6788 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6789 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
6790 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6791 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6792 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6794 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6796 818c7501 2019-07-11 stsp return err;
6798 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
6799 945f9229 2022-04-16 thomas worktree->base_commit_id);
6800 945f9229 2022-04-16 thomas if (err)
6801 945f9229 2022-04-16 thomas goto done;
6803 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6804 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6806 818c7501 2019-07-11 stsp goto done;
6808 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6810 818c7501 2019-07-11 stsp goto done;
6813 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6814 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6815 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6817 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6819 818c7501 2019-07-11 stsp goto done;
6821 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6823 818c7501 2019-07-11 stsp goto done;
6825 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
6826 945f9229 2022-04-16 thomas worktree->path_prefix);
6828 ca355955 2019-07-12 stsp goto done;
6830 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6832 ca355955 2019-07-12 stsp goto done;
6834 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6836 818c7501 2019-07-11 stsp goto done;
6838 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6839 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6840 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6841 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6842 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6843 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6844 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6845 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
6846 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6847 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
6849 1f1abb7e 2019-08-08 stsp goto sync;
6851 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6852 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6854 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6855 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6856 ca355955 2019-07-12 stsp err = sync_err;
6858 818c7501 2019-07-11 stsp got_ref_close(resolved);
6859 a3a2faf2 2019-07-12 stsp free(tree_id);
6860 818c7501 2019-07-11 stsp free(commit_id);
6861 945f9229 2022-04-16 thomas if (commit)
6862 945f9229 2022-04-16 thomas got_object_commit_close(commit);
6863 0ebf8283 2019-07-24 stsp if (fileindex)
6864 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6865 0ebf8283 2019-07-24 stsp free(fileindex_path);
6867 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6868 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6869 0ebf8283 2019-07-24 stsp err = unlockerr;
6870 0ebf8283 2019-07-24 stsp return err;
6873 0ebf8283 2019-07-24 stsp const struct got_error *
6874 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6875 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6876 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6877 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6879 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6880 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6881 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6882 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6883 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6884 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6885 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6886 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6888 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6889 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6890 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6891 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6893 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6895 0ebf8283 2019-07-24 stsp return err;
6897 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6899 0ebf8283 2019-07-24 stsp goto done;
6901 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6902 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6903 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6906 0ebf8283 2019-07-24 stsp goto done;
6908 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6910 0ebf8283 2019-07-24 stsp goto done;
6912 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6914 0ebf8283 2019-07-24 stsp goto done;
6916 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6917 0ebf8283 2019-07-24 stsp worktree);
6919 0ebf8283 2019-07-24 stsp goto done;
6921 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6924 0ebf8283 2019-07-24 stsp goto done;
6926 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6928 0ebf8283 2019-07-24 stsp goto done;
6930 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6932 0ebf8283 2019-07-24 stsp goto done;
6934 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6935 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6937 0ebf8283 2019-07-24 stsp goto done;
6938 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6940 0ebf8283 2019-07-24 stsp goto done;
6941 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6942 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6943 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6944 0ebf8283 2019-07-24 stsp goto done;
6947 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6948 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6950 0ebf8283 2019-07-24 stsp goto done;
6951 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6953 0ebf8283 2019-07-24 stsp goto done;
6955 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6957 0ebf8283 2019-07-24 stsp goto done;
6959 0ebf8283 2019-07-24 stsp free(fileindex_path);
6960 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6961 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6962 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6963 0ebf8283 2019-07-24 stsp if (wt_branch)
6964 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6965 0ebf8283 2019-07-24 stsp if (err) {
6966 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6967 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6968 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6970 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6971 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6972 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6974 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6975 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6976 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6977 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6979 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6981 0ebf8283 2019-07-24 stsp return err;
6984 0ebf8283 2019-07-24 stsp const struct got_error *
6985 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6986 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6988 3e3a69f1 2019-07-25 stsp if (fileindex)
6989 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6990 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6993 0ebf8283 2019-07-24 stsp const struct got_error *
6994 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6995 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6997 0ebf8283 2019-07-24 stsp const struct got_error *err;
6998 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7000 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7002 0ebf8283 2019-07-24 stsp return err;
7004 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7005 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7006 0ebf8283 2019-07-24 stsp return NULL;
7009 0ebf8283 2019-07-24 stsp const struct got_error *
7010 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
7011 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
7012 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7013 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7015 0ebf8283 2019-07-24 stsp const struct got_error *err;
7016 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7017 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7018 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
7019 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7020 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
7021 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
7023 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7024 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7025 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7026 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7028 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7030 3e3a69f1 2019-07-25 stsp return err;
7032 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7034 f032f1f7 2019-08-04 stsp goto done;
7036 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7037 f032f1f7 2019-08-04 stsp &have_staged_files);
7038 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7039 f032f1f7 2019-08-04 stsp goto done;
7040 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7041 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7042 3e3a69f1 2019-07-25 stsp goto done;
7045 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7047 f032f1f7 2019-08-04 stsp goto done;
7049 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7051 0ebf8283 2019-07-24 stsp goto done;
7053 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7055 0ebf8283 2019-07-24 stsp goto done;
7057 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7058 0ebf8283 2019-07-24 stsp worktree);
7060 0ebf8283 2019-07-24 stsp goto done;
7062 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7064 0ebf8283 2019-07-24 stsp goto done;
7066 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7068 0ebf8283 2019-07-24 stsp goto done;
7069 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7071 0ebf8283 2019-07-24 stsp goto done;
7073 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7075 0ebf8283 2019-07-24 stsp goto done;
7076 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7078 0ebf8283 2019-07-24 stsp goto done;
7080 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7082 0ebf8283 2019-07-24 stsp goto done;
7084 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7085 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7086 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7087 0ebf8283 2019-07-24 stsp if (commit_ref)
7088 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7089 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7090 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7091 0ebf8283 2019-07-24 stsp if (err) {
7092 0ebf8283 2019-07-24 stsp free(*commit_id);
7093 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7094 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7095 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7096 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7097 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7098 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7100 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7101 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7102 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7104 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7106 0ebf8283 2019-07-24 stsp return err;
7109 0ebf8283 2019-07-24 stsp static const struct got_error *
7110 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7112 0ebf8283 2019-07-24 stsp const struct got_error *err;
7113 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7114 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7116 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7118 0ebf8283 2019-07-24 stsp goto done;
7119 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7121 0ebf8283 2019-07-24 stsp goto done;
7123 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7124 0ebf8283 2019-07-24 stsp worktree);
7126 0ebf8283 2019-07-24 stsp goto done;
7127 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7129 0ebf8283 2019-07-24 stsp goto done;
7131 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7133 0ebf8283 2019-07-24 stsp goto done;
7134 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7136 0ebf8283 2019-07-24 stsp goto done;
7138 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7140 0ebf8283 2019-07-24 stsp goto done;
7141 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7143 0ebf8283 2019-07-24 stsp goto done;
7145 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7146 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7147 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7148 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7149 0ebf8283 2019-07-24 stsp return err;
7152 0ebf8283 2019-07-24 stsp const struct got_error *
7153 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7154 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7155 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7156 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7158 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7159 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7160 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7161 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7162 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7163 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7165 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7167 0ebf8283 2019-07-24 stsp return err;
7169 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
7170 945f9229 2022-04-16 thomas worktree->base_commit_id);
7171 945f9229 2022-04-16 thomas if (err)
7172 945f9229 2022-04-16 thomas goto done;
7174 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7175 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7177 0ebf8283 2019-07-24 stsp goto done;
7179 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7181 0ebf8283 2019-07-24 stsp goto done;
7183 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7185 0ebf8283 2019-07-24 stsp goto done;
7187 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7188 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7190 0ebf8283 2019-07-24 stsp goto done;
7192 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7194 0ebf8283 2019-07-24 stsp goto done;
7196 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7198 0ebf8283 2019-07-24 stsp goto done;
7200 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7201 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7202 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7203 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7204 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7205 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7206 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7207 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
7208 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7209 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7211 1f1abb7e 2019-08-08 stsp goto sync;
7213 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7214 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7216 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7217 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7218 0ebf8283 2019-07-24 stsp err = sync_err;
7220 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7221 0ebf8283 2019-07-24 stsp free(tree_id);
7222 818c7501 2019-07-11 stsp free(fileindex_path);
7224 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7225 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7226 818c7501 2019-07-11 stsp err = unlockerr;
7227 818c7501 2019-07-11 stsp return err;
7230 0ebf8283 2019-07-24 stsp const struct got_error *
7231 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7232 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7233 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7235 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7236 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7237 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7238 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7240 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7242 0ebf8283 2019-07-24 stsp return err;
7244 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7245 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7247 e600f124 2021-03-21 stsp goto done;
7249 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7250 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7252 0ebf8283 2019-07-24 stsp goto done;
7254 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7256 0ebf8283 2019-07-24 stsp goto done;
7258 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7260 0ebf8283 2019-07-24 stsp goto done;
7262 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7264 0ebf8283 2019-07-24 stsp goto done;
7266 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7268 a615e0e7 2020-12-16 stsp goto done;
7270 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7272 a615e0e7 2020-12-16 stsp goto done;
7273 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7274 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7275 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7276 a615e0e7 2020-12-16 stsp err = sync_err;
7278 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7279 a615e0e7 2020-12-16 stsp free(fileindex_path);
7280 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7281 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7282 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7283 0ebf8283 2019-07-24 stsp err = unlockerr;
7284 0ebf8283 2019-07-24 stsp return err;
7287 0ebf8283 2019-07-24 stsp const struct got_error *
7288 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7289 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7291 0ebf8283 2019-07-24 stsp const struct got_error *err;
7292 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7294 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7296 0ebf8283 2019-07-24 stsp return err;
7298 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7300 0ebf8283 2019-07-24 stsp goto done;
7302 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7304 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7305 2822a352 2019-10-15 stsp return err;
7308 2822a352 2019-10-15 stsp const struct got_error *
7309 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7310 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7311 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7312 2822a352 2019-10-15 stsp struct got_repository *repo)
7314 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7315 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7316 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7318 2822a352 2019-10-15 stsp *fileindex = NULL;
7319 2822a352 2019-10-15 stsp *branch_ref = NULL;
7320 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7322 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7324 2822a352 2019-10-15 stsp return err;
7326 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7327 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7328 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7329 2822a352 2019-10-15 stsp "update -b or different branch name required");
7330 2822a352 2019-10-15 stsp goto done;
7333 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7335 2822a352 2019-10-15 stsp goto done;
7337 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7338 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7339 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7340 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7343 2822a352 2019-10-15 stsp goto done;
7345 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7347 2822a352 2019-10-15 stsp goto done;
7349 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7350 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7352 2822a352 2019-10-15 stsp if (err) {
7353 2822a352 2019-10-15 stsp if (*branch_ref) {
7354 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7355 2822a352 2019-10-15 stsp *branch_ref = NULL;
7357 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7358 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7359 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7361 2822a352 2019-10-15 stsp if (*fileindex) {
7362 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7363 2822a352 2019-10-15 stsp *fileindex = NULL;
7365 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7367 0cb83759 2019-08-03 stsp return err;
7370 2822a352 2019-10-15 stsp const struct got_error *
7371 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7372 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7373 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7374 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7375 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7377 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7378 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7379 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7380 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7382 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7384 2822a352 2019-10-15 stsp goto done;
7386 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7388 2822a352 2019-10-15 stsp goto done;
7390 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, commit_id);
7391 945f9229 2022-04-16 thomas if (err)
7392 945f9229 2022-04-16 thomas goto done;
7394 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7395 2822a352 2019-10-15 stsp worktree->path_prefix);
7397 2822a352 2019-10-15 stsp goto done;
7399 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7401 2822a352 2019-10-15 stsp goto done;
7403 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7404 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7406 2822a352 2019-10-15 stsp goto sync;
7408 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7410 2822a352 2019-10-15 stsp goto sync;
7412 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7414 6e210706 2021-01-22 stsp goto sync;
7416 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7418 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7419 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7420 2822a352 2019-10-15 stsp err = sync_err;
7423 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7424 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7425 2822a352 2019-10-15 stsp err = unlockerr;
7426 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7428 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7429 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7430 2822a352 2019-10-15 stsp err = unlockerr;
7431 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7433 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7434 2822a352 2019-10-15 stsp free(fileindex_path);
7435 2822a352 2019-10-15 stsp free(tree_id);
7436 945f9229 2022-04-16 thomas if (commit)
7437 945f9229 2022-04-16 thomas got_object_commit_close(commit);
7439 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7440 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7441 2822a352 2019-10-15 stsp err = unlockerr;
7442 2822a352 2019-10-15 stsp return err;
7445 2822a352 2019-10-15 stsp const struct got_error *
7446 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7447 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7448 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7450 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7452 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7454 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7456 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7457 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7458 8b692cd0 2019-10-21 stsp err = unlockerr;
7459 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7461 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7462 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7463 8b692cd0 2019-10-21 stsp err = unlockerr;
7464 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7466 10604dce 2021-09-24 thomas return err;
7469 10604dce 2021-09-24 thomas const struct got_error *
7470 10604dce 2021-09-24 thomas got_worktree_merge_postpone(struct got_worktree *worktree,
7471 10604dce 2021-09-24 thomas struct got_fileindex *fileindex)
7473 10604dce 2021-09-24 thomas const struct got_error *err, *sync_err;
7474 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7476 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7477 10604dce 2021-09-24 thomas if (err)
7478 10604dce 2021-09-24 thomas goto done;
7480 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7482 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_SH);
7483 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7484 10604dce 2021-09-24 thomas err = sync_err;
7486 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7487 10604dce 2021-09-24 thomas free(fileindex_path);
7488 8b692cd0 2019-10-21 stsp return err;
7491 10604dce 2021-09-24 thomas static const struct got_error *
7492 10604dce 2021-09-24 thomas delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7494 10604dce 2021-09-24 thomas const struct got_error *err;
7495 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7497 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7498 10604dce 2021-09-24 thomas if (err)
7499 10604dce 2021-09-24 thomas goto done;
7500 10604dce 2021-09-24 thomas err = delete_ref(branch_refname, repo);
7501 10604dce 2021-09-24 thomas if (err)
7502 10604dce 2021-09-24 thomas goto done;
7504 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7505 10604dce 2021-09-24 thomas if (err)
7506 10604dce 2021-09-24 thomas goto done;
7507 10604dce 2021-09-24 thomas err = delete_ref(commit_refname, repo);
7508 10604dce 2021-09-24 thomas if (err)
7509 10604dce 2021-09-24 thomas goto done;
7512 10604dce 2021-09-24 thomas free(branch_refname);
7513 10604dce 2021-09-24 thomas free(commit_refname);
7514 10604dce 2021-09-24 thomas return err;
7517 10604dce 2021-09-24 thomas struct merge_commit_msg_arg {
7518 10604dce 2021-09-24 thomas struct got_worktree *worktree;
7519 10604dce 2021-09-24 thomas const char *branch_name;
7522 10604dce 2021-09-24 thomas static const struct got_error *
7523 10604dce 2021-09-24 thomas merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7524 10604dce 2021-09-24 thomas void *arg)
7526 10604dce 2021-09-24 thomas struct merge_commit_msg_arg *a = arg;
7528 10604dce 2021-09-24 thomas if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7529 10604dce 2021-09-24 thomas got_worktree_get_head_ref_name(a->worktree)) == -1)
7530 10604dce 2021-09-24 thomas return got_error_from_errno("asprintf");
7532 10604dce 2021-09-24 thomas return NULL;
7536 10604dce 2021-09-24 thomas const struct got_error *
7537 10604dce 2021-09-24 thomas got_worktree_merge_branch(struct got_worktree *worktree,
7538 10604dce 2021-09-24 thomas struct got_fileindex *fileindex,
7539 10604dce 2021-09-24 thomas struct got_object_id *yca_commit_id,
7540 10604dce 2021-09-24 thomas struct got_object_id *branch_tip,
7541 10604dce 2021-09-24 thomas struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7542 10604dce 2021-09-24 thomas void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7544 10604dce 2021-09-24 thomas const struct got_error *err;
7545 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
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;
7551 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7552 10604dce 2021-09-24 thomas worktree);
7553 10604dce 2021-09-24 thomas if (err)
7554 10604dce 2021-09-24 thomas goto done;
7556 10604dce 2021-09-24 thomas err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7557 10604dce 2021-09-24 thomas branch_tip, repo, progress_cb, progress_arg,
7558 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
7560 10604dce 2021-09-24 thomas free(fileindex_path);
7561 10604dce 2021-09-24 thomas return err;
7564 10604dce 2021-09-24 thomas const struct got_error *
7565 10604dce 2021-09-24 thomas got_worktree_merge_commit(struct got_object_id **new_commit_id,
7566 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
7567 10604dce 2021-09-24 thomas const char *author, const char *committer, int allow_bad_symlinks,
7568 10604dce 2021-09-24 thomas struct got_object_id *branch_tip, const char *branch_name,
7569 ae1e948a 2021-09-28 thomas struct got_repository *repo,
7570 ae1e948a 2021-09-28 thomas got_worktree_status_cb status_cb, void *status_arg)
7573 10604dce 2021-09-24 thomas const struct got_error *err = NULL, *sync_err;
7574 10604dce 2021-09-24 thomas struct got_pathlist_head commitable_paths;
7575 10604dce 2021-09-24 thomas struct collect_commitables_arg cc_arg;
7576 10604dce 2021-09-24 thomas struct got_pathlist_entry *pe;
7577 10604dce 2021-09-24 thomas struct got_reference *head_ref = NULL;
7578 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id = NULL;
7579 10604dce 2021-09-24 thomas int have_staged_files = 0;
7580 10604dce 2021-09-24 thomas struct merge_commit_msg_arg mcm_arg;
7581 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7583 10604dce 2021-09-24 thomas *new_commit_id = NULL;
7585 10604dce 2021-09-24 thomas TAILQ_INIT(&commitable_paths);
7587 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7588 10604dce 2021-09-24 thomas if (err)
7589 10604dce 2021-09-24 thomas goto done;
7591 10604dce 2021-09-24 thomas err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7592 10604dce 2021-09-24 thomas if (err)
7593 10604dce 2021-09-24 thomas goto done;
7595 10604dce 2021-09-24 thomas err = got_ref_resolve(&head_commit_id, repo, head_ref);
7596 10604dce 2021-09-24 thomas if (err)
7597 10604dce 2021-09-24 thomas goto done;
7599 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7600 10604dce 2021-09-24 thomas &have_staged_files);
7601 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7602 10604dce 2021-09-24 thomas goto done;
7603 10604dce 2021-09-24 thomas if (have_staged_files) {
7604 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7605 10604dce 2021-09-24 thomas goto done;
7608 10604dce 2021-09-24 thomas cc_arg.commitable_paths = &commitable_paths;
7609 10604dce 2021-09-24 thomas cc_arg.worktree = worktree;
7610 10604dce 2021-09-24 thomas cc_arg.fileindex = fileindex;
7611 10604dce 2021-09-24 thomas cc_arg.repo = repo;
7612 10604dce 2021-09-24 thomas cc_arg.have_staged_files = have_staged_files;
7613 10604dce 2021-09-24 thomas cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7614 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7615 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7616 10604dce 2021-09-24 thomas if (err)
7617 10604dce 2021-09-24 thomas goto done;
7619 10604dce 2021-09-24 thomas if (TAILQ_EMPTY(&commitable_paths)) {
7620 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7621 10604dce 2021-09-24 thomas "merge of %s cannot proceed", branch_name);
7622 10604dce 2021-09-24 thomas goto done;
7625 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7626 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7627 10604dce 2021-09-24 thomas const char *ct_path = ct->in_repo_path;
7629 10604dce 2021-09-24 thomas while (ct_path[0] == '/')
7630 10604dce 2021-09-24 thomas ct_path++;
7631 10604dce 2021-09-24 thomas err = check_out_of_date(ct_path, ct->status,
7632 10604dce 2021-09-24 thomas ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7633 10604dce 2021-09-24 thomas head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7634 10604dce 2021-09-24 thomas if (err)
7635 10604dce 2021-09-24 thomas goto done;
7639 10604dce 2021-09-24 thomas mcm_arg.worktree = worktree;
7640 10604dce 2021-09-24 thomas mcm_arg.branch_name = branch_name;
7641 10604dce 2021-09-24 thomas err = commit_worktree(new_commit_id, &commitable_paths,
7642 10604dce 2021-09-24 thomas head_commit_id, branch_tip, worktree, author, committer,
7643 ae1e948a 2021-09-28 thomas merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7644 10604dce 2021-09-24 thomas if (err)
7645 10604dce 2021-09-24 thomas goto done;
7647 10604dce 2021-09-24 thomas err = update_fileindex_after_commit(worktree, &commitable_paths,
7648 10604dce 2021-09-24 thomas *new_commit_id, fileindex, have_staged_files);
7649 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7650 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7651 10604dce 2021-09-24 thomas err = sync_err;
7653 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7654 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7655 10604dce 2021-09-24 thomas free_commitable(ct);
7657 10604dce 2021-09-24 thomas got_pathlist_free(&commitable_paths);
7658 10604dce 2021-09-24 thomas free(fileindex_path);
7659 10604dce 2021-09-24 thomas return err;
7662 10604dce 2021-09-24 thomas const struct got_error *
7663 10604dce 2021-09-24 thomas got_worktree_merge_complete(struct got_worktree *worktree,
7664 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo)
7666 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7667 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7669 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7670 10604dce 2021-09-24 thomas if (err)
7671 10604dce 2021-09-24 thomas goto done;
7673 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7674 10604dce 2021-09-24 thomas if (err)
7675 10604dce 2021-09-24 thomas goto done;
7676 10604dce 2021-09-24 thomas err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7677 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7678 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7679 10604dce 2021-09-24 thomas err = sync_err;
7681 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7682 10604dce 2021-09-24 thomas free(fileindex_path);
7683 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7684 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7685 10604dce 2021-09-24 thomas err = unlockerr;
7686 10604dce 2021-09-24 thomas return err;
7689 10604dce 2021-09-24 thomas const struct got_error *
7690 10604dce 2021-09-24 thomas got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7691 10604dce 2021-09-24 thomas struct got_repository *repo)
7693 10604dce 2021-09-24 thomas const struct got_error *err;
7694 10604dce 2021-09-24 thomas char *branch_refname = NULL;
7695 10604dce 2021-09-24 thomas struct got_reference *branch_ref = NULL;
7697 10604dce 2021-09-24 thomas *in_progress = 0;
7699 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7700 10604dce 2021-09-24 thomas if (err)
7701 10604dce 2021-09-24 thomas return err;
7702 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7703 dfe86d1f 2021-09-24 thomas free(branch_refname);
7704 10604dce 2021-09-24 thomas if (err) {
7705 10604dce 2021-09-24 thomas if (err->code != GOT_ERR_NOT_REF)
7706 10604dce 2021-09-24 thomas return err;
7708 10604dce 2021-09-24 thomas *in_progress = 1;
7710 10604dce 2021-09-24 thomas return NULL;
7713 10604dce 2021-09-24 thomas const struct got_error *got_worktree_merge_prepare(
7714 10604dce 2021-09-24 thomas struct got_fileindex **fileindex, struct got_worktree *worktree,
7715 10604dce 2021-09-24 thomas struct got_reference *branch, struct got_repository *repo)
7717 10604dce 2021-09-24 thomas const struct got_error *err = NULL;
7718 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7719 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7720 10604dce 2021-09-24 thomas struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7721 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL;
7722 10604dce 2021-09-24 thomas struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7723 10604dce 2021-09-24 thomas struct check_rebase_ok_arg ok_arg;
7725 10604dce 2021-09-24 thomas *fileindex = NULL;
7727 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
7728 10604dce 2021-09-24 thomas if (err)
7729 10604dce 2021-09-24 thomas return err;
7731 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
7732 10604dce 2021-09-24 thomas if (err)
7733 10604dce 2021-09-24 thomas goto done;
7735 10604dce 2021-09-24 thomas /* Preconditions are the same as for rebase. */
7736 10604dce 2021-09-24 thomas ok_arg.worktree = worktree;
7737 10604dce 2021-09-24 thomas ok_arg.repo = repo;
7738 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7739 10604dce 2021-09-24 thomas &ok_arg);
7740 10604dce 2021-09-24 thomas if (err)
7741 10604dce 2021-09-24 thomas goto done;
7743 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7744 10604dce 2021-09-24 thomas if (err)
7745 10604dce 2021-09-24 thomas return err;
7747 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7748 10604dce 2021-09-24 thomas if (err)
7749 10604dce 2021-09-24 thomas return err;
7751 10604dce 2021-09-24 thomas err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7753 10604dce 2021-09-24 thomas if (err)
7754 10604dce 2021-09-24 thomas goto done;
7756 10604dce 2021-09-24 thomas err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7757 10604dce 2021-09-24 thomas if (err)
7758 10604dce 2021-09-24 thomas goto done;
7760 10604dce 2021-09-24 thomas if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7761 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7762 10604dce 2021-09-24 thomas goto done;
7765 10604dce 2021-09-24 thomas err = got_ref_resolve(&branch_tip, repo, branch);
7766 10604dce 2021-09-24 thomas if (err)
7767 10604dce 2021-09-24 thomas goto done;
7769 10604dce 2021-09-24 thomas err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7770 10604dce 2021-09-24 thomas if (err)
7771 10604dce 2021-09-24 thomas goto done;
7772 10604dce 2021-09-24 thomas err = got_ref_write(branch_ref, repo);
7773 10604dce 2021-09-24 thomas if (err)
7774 10604dce 2021-09-24 thomas goto done;
7776 10604dce 2021-09-24 thomas err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7777 10604dce 2021-09-24 thomas if (err)
7778 10604dce 2021-09-24 thomas goto done;
7779 10604dce 2021-09-24 thomas err = got_ref_write(commit_ref, repo);
7780 10604dce 2021-09-24 thomas if (err)
7781 10604dce 2021-09-24 thomas goto done;
7784 10604dce 2021-09-24 thomas free(branch_refname);
7785 10604dce 2021-09-24 thomas free(commit_refname);
7786 10604dce 2021-09-24 thomas free(fileindex_path);
7787 10604dce 2021-09-24 thomas if (branch_ref)
7788 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
7789 10604dce 2021-09-24 thomas if (commit_ref)
7790 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
7791 10604dce 2021-09-24 thomas if (wt_branch)
7792 10604dce 2021-09-24 thomas got_ref_close(wt_branch);
7793 10604dce 2021-09-24 thomas free(wt_branch_tip);
7794 10604dce 2021-09-24 thomas if (err) {
7795 10604dce 2021-09-24 thomas if (*fileindex) {
7796 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
7797 10604dce 2021-09-24 thomas *fileindex = NULL;
7799 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
7801 10604dce 2021-09-24 thomas return err;
7804 10604dce 2021-09-24 thomas const struct got_error *
7805 10604dce 2021-09-24 thomas got_worktree_merge_continue(char **branch_name,
7806 10604dce 2021-09-24 thomas struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7807 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_repository *repo)
7809 10604dce 2021-09-24 thomas const struct got_error *err;
7810 10604dce 2021-09-24 thomas char *commit_refname = NULL, *branch_refname = NULL;
7811 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7812 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7813 10604dce 2021-09-24 thomas int have_staged_files = 0;
7815 10604dce 2021-09-24 thomas *branch_name = NULL;
7816 10604dce 2021-09-24 thomas *branch_tip = NULL;
7817 10604dce 2021-09-24 thomas *fileindex = NULL;
7819 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
7820 10604dce 2021-09-24 thomas if (err)
7821 10604dce 2021-09-24 thomas return err;
7823 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
7824 10604dce 2021-09-24 thomas if (err)
7825 10604dce 2021-09-24 thomas goto done;
7827 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7828 10604dce 2021-09-24 thomas &have_staged_files);
7829 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7830 10604dce 2021-09-24 thomas goto done;
7831 10604dce 2021-09-24 thomas if (have_staged_files) {
7832 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_STAGED_PATHS);
7833 10604dce 2021-09-24 thomas goto done;
7836 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7837 10604dce 2021-09-24 thomas if (err)
7838 10604dce 2021-09-24 thomas goto done;
7840 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7841 10604dce 2021-09-24 thomas if (err)
7842 10604dce 2021-09-24 thomas goto done;
7844 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7845 10604dce 2021-09-24 thomas if (err)
7846 10604dce 2021-09-24 thomas goto done;
7848 10604dce 2021-09-24 thomas if (!got_ref_is_symbolic(branch_ref)) {
7849 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7850 10604dce 2021-09-24 thomas "%s is not a symbolic reference",
7851 10604dce 2021-09-24 thomas got_ref_get_name(branch_ref));
7852 10604dce 2021-09-24 thomas goto done;
7854 10604dce 2021-09-24 thomas *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7855 10604dce 2021-09-24 thomas if (*branch_name == NULL) {
7856 10604dce 2021-09-24 thomas err = got_error_from_errno("strdup");
7857 10604dce 2021-09-24 thomas goto done;
7860 10604dce 2021-09-24 thomas err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7861 10604dce 2021-09-24 thomas if (err)
7862 10604dce 2021-09-24 thomas goto done;
7864 10604dce 2021-09-24 thomas err = got_ref_resolve(branch_tip, repo, commit_ref);
7865 10604dce 2021-09-24 thomas if (err)
7866 10604dce 2021-09-24 thomas goto done;
7868 10604dce 2021-09-24 thomas free(commit_refname);
7869 10604dce 2021-09-24 thomas free(branch_refname);
7870 10604dce 2021-09-24 thomas free(fileindex_path);
7871 10604dce 2021-09-24 thomas if (commit_ref)
7872 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
7873 10604dce 2021-09-24 thomas if (branch_ref)
7874 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
7875 10604dce 2021-09-24 thomas if (err) {
7876 10604dce 2021-09-24 thomas if (*branch_name) {
7877 10604dce 2021-09-24 thomas free(*branch_name);
7878 10604dce 2021-09-24 thomas *branch_name = NULL;
7880 10604dce 2021-09-24 thomas free(*branch_tip);
7881 10604dce 2021-09-24 thomas *branch_tip = NULL;
7882 10604dce 2021-09-24 thomas if (*fileindex) {
7883 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
7884 10604dce 2021-09-24 thomas *fileindex = NULL;
7886 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
7888 10604dce 2021-09-24 thomas return err;
7891 10604dce 2021-09-24 thomas const struct got_error *
7892 10604dce 2021-09-24 thomas got_worktree_merge_abort(struct got_worktree *worktree,
7893 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo,
7894 10604dce 2021-09-24 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
7896 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7897 10604dce 2021-09-24 thomas struct got_object_id *commit_id = NULL;
7898 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7899 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7900 10604dce 2021-09-24 thomas struct revert_file_args rfa;
7901 10604dce 2021-09-24 thomas struct got_object_id *tree_id = NULL;
7903 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
7904 945f9229 2022-04-16 thomas worktree->base_commit_id);
7905 945f9229 2022-04-16 thomas if (err)
7906 945f9229 2022-04-16 thomas goto done;
7908 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7909 945f9229 2022-04-16 thomas worktree->path_prefix);
7910 10604dce 2021-09-24 thomas if (err)
7911 10604dce 2021-09-24 thomas goto done;
7913 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7914 10604dce 2021-09-24 thomas if (err)
7915 10604dce 2021-09-24 thomas goto done;
7917 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7918 10604dce 2021-09-24 thomas if (err)
7919 10604dce 2021-09-24 thomas goto done;
7921 10604dce 2021-09-24 thomas rfa.worktree = worktree;
7922 10604dce 2021-09-24 thomas rfa.fileindex = fileindex;
7923 10604dce 2021-09-24 thomas rfa.progress_cb = progress_cb;
7924 10604dce 2021-09-24 thomas rfa.progress_arg = progress_arg;
7925 10604dce 2021-09-24 thomas rfa.patch_cb = NULL;
7926 10604dce 2021-09-24 thomas rfa.patch_arg = NULL;
7927 10604dce 2021-09-24 thomas rfa.repo = repo;
7928 10604dce 2021-09-24 thomas rfa.unlink_added_files = 1;
7929 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7930 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7931 10604dce 2021-09-24 thomas if (err)
7932 10604dce 2021-09-24 thomas goto sync;
7934 10604dce 2021-09-24 thomas err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7935 10604dce 2021-09-24 thomas repo, progress_cb, progress_arg, NULL, NULL);
7937 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7938 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7939 10604dce 2021-09-24 thomas err = sync_err;
7941 10604dce 2021-09-24 thomas free(tree_id);
7942 10604dce 2021-09-24 thomas free(commit_id);
7943 945f9229 2022-04-16 thomas if (commit)
7944 945f9229 2022-04-16 thomas got_object_commit_close(commit);
7945 10604dce 2021-09-24 thomas if (fileindex)
7946 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7947 10604dce 2021-09-24 thomas free(fileindex_path);
7949 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7950 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7951 10604dce 2021-09-24 thomas err = unlockerr;
7952 10604dce 2021-09-24 thomas return err;
7955 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7956 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7957 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7958 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7959 2db2652d 2019-08-07 stsp struct got_repository *repo;
7960 2db2652d 2019-08-07 stsp int have_changes;
7963 ef20f542 2022-06-26 thomas static const struct got_error *
7964 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7965 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7966 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7967 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7969 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7970 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7971 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7972 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7973 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7974 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7976 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7977 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7978 8b13ce36 2019-08-08 stsp return NULL;
7979 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7980 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7982 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7983 735ef5ac 2019-08-03 stsp if (ie == NULL)
7984 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7986 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7987 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7988 735ef5ac 2019-08-03 stsp relpath) == -1)
7989 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7991 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7992 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7993 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7994 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7997 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7998 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7999 3aa5969e 2019-08-06 stsp goto done;
8000 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
8001 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
8002 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
8003 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8004 735ef5ac 2019-08-03 stsp goto done;
8007 2db2652d 2019-08-07 stsp a->have_changes = 1;
8009 735ef5ac 2019-08-03 stsp p = in_repo_path;
8010 735ef5ac 2019-08-03 stsp while (p[0] == '/')
8012 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
8013 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
8014 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
8016 735ef5ac 2019-08-03 stsp free(in_repo_path);
8017 dc424a06 2019-08-07 stsp return err;
8020 2db2652d 2019-08-07 stsp struct stage_path_arg {
8021 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8022 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8023 2db2652d 2019-08-07 stsp struct got_repository *repo;
8024 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
8025 2db2652d 2019-08-07 stsp void *status_arg;
8026 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
8027 2db2652d 2019-08-07 stsp void *patch_arg;
8028 7b5dc508 2019-10-28 stsp int staged_something;
8029 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
8032 2db2652d 2019-08-07 stsp static const struct got_error *
8033 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
8034 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8035 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8036 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8038 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8039 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8040 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8041 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8042 0cb83759 2019-08-03 stsp uint32_t stage;
8043 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8044 0aeb8099 2020-07-23 stsp struct stat sb;
8046 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8047 8b13ce36 2019-08-08 stsp return NULL;
8049 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8050 d3e7c587 2019-08-03 stsp if (ie == NULL)
8051 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8053 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8054 2db2652d 2019-08-07 stsp relpath)== -1)
8055 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8057 0cb83759 2019-08-03 stsp switch (status) {
8058 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8059 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8060 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8061 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8062 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8065 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8066 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8067 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8068 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8069 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8072 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8075 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8076 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8077 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8078 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8079 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8083 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8084 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8087 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8088 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8089 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8090 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8092 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8093 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8094 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8095 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8096 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8097 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8098 35213c7c 2020-07-23 stsp ssize_t target_len;
8099 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8100 35213c7c 2020-07-23 stsp sizeof(target_path));
8101 35213c7c 2020-07-23 stsp if (target_len == -1) {
8102 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8103 35213c7c 2020-07-23 stsp ondisk_path);
8106 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8107 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8108 35213c7c 2020-07-23 stsp a->worktree->root_path);
8111 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8112 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8113 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8117 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8118 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8119 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8121 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8122 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8124 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8125 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8127 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8128 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8130 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8131 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8132 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8133 f289c82c 2022-06-13 thomas if (err)
8136 f289c82c 2022-06-13 thomas * When staging the reverse of the staged diff,
8137 f289c82c 2022-06-13 thomas * implicitly unstage the file.
8139 f289c82c 2022-06-13 thomas if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8140 f289c82c 2022-06-13 thomas sizeof(ie->blob_sha1)) == 0) {
8141 f289c82c 2022-06-13 thomas got_fileindex_entry_stage_set(ie,
8142 f289c82c 2022-06-13 thomas GOT_FILEIDX_STAGE_NONE);
8145 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8146 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8148 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8149 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8150 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8151 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8154 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8156 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8157 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8161 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8162 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8163 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8164 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8166 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8167 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8170 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8172 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8173 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8175 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8176 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8179 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8183 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8184 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8185 dc424a06 2019-08-07 stsp free(path_content);
8186 2db2652d 2019-08-07 stsp free(ondisk_path);
8187 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8188 0ebf8283 2019-07-24 stsp return err;
8191 0cb83759 2019-08-03 stsp const struct got_error *
8192 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8193 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8194 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8195 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8196 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8198 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8199 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8200 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8201 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8202 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8203 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8204 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8205 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8207 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8209 0cb83759 2019-08-03 stsp return err;
8211 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8212 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8214 735ef5ac 2019-08-03 stsp goto done;
8215 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8217 735ef5ac 2019-08-03 stsp goto done;
8218 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8220 0cb83759 2019-08-03 stsp goto done;
8222 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8223 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8224 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8225 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8226 2db2652d 2019-08-07 stsp oka.repo = repo;
8227 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8228 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8229 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8230 6092c299 2021-10-04 thomas check_stage_ok, &oka, NULL, NULL, 1, 0);
8232 735ef5ac 2019-08-03 stsp goto done;
8234 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8235 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8236 2db2652d 2019-08-07 stsp goto done;
8239 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8240 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8241 2db2652d 2019-08-07 stsp spa.repo = repo;
8242 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8243 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8244 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8245 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8246 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8247 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8248 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8249 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8250 6092c299 2021-10-04 thomas stage_path, &spa, NULL, NULL, 1, 0);
8252 2db2652d 2019-08-07 stsp goto done;
8254 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8255 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8256 7b5dc508 2019-10-28 stsp goto done;
8259 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8260 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8261 0cb83759 2019-08-03 stsp err = sync_err;
8263 735ef5ac 2019-08-03 stsp if (head_ref)
8264 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8265 735ef5ac 2019-08-03 stsp free(head_commit_id);
8266 0cb83759 2019-08-03 stsp free(fileindex_path);
8267 0cb83759 2019-08-03 stsp if (fileindex)
8268 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8269 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8270 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8271 0cb83759 2019-08-03 stsp err = unlockerr;
8272 0cb83759 2019-08-03 stsp return err;
8275 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8276 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8277 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8278 ad493afc 2019-08-03 stsp struct got_repository *repo;
8279 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8280 ad493afc 2019-08-03 stsp void *progress_arg;
8281 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8282 2e1f37b0 2019-08-08 stsp void *patch_arg;
8285 2e1f37b0 2019-08-08 stsp static const struct got_error *
8286 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8287 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8288 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8289 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8290 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8292 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8293 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8294 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8295 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8296 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8297 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8298 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8299 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
8301 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8302 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8304 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8306 2e1f37b0 2019-08-08 stsp return err;
8308 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
8309 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
8310 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8311 f4ae6ddb 2022-07-01 thomas goto done;
8313 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
8314 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
8315 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8316 f4ae6ddb 2022-07-01 thomas goto done;
8319 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8321 2e1f37b0 2019-08-08 stsp goto done;
8323 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8325 2e1f37b0 2019-08-08 stsp goto done;
8327 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8329 2e1f37b0 2019-08-08 stsp goto done;
8331 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8334 2e1f37b0 2019-08-08 stsp goto done;
8336 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8338 2e1f37b0 2019-08-08 stsp goto done;
8340 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8342 2e1f37b0 2019-08-08 stsp goto done;
8344 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8345 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8347 2e1f37b0 2019-08-08 stsp goto done;
8349 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8350 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8352 2e1f37b0 2019-08-08 stsp goto done;
8353 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8354 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8356 2e1f37b0 2019-08-08 stsp goto done;
8358 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8359 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8360 2e1f37b0 2019-08-08 stsp goto done;
8362 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8363 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8364 2e1f37b0 2019-08-08 stsp goto done;
8366 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8367 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8368 f4ae6ddb 2022-07-01 thomas struct diff_chunk_context cc = {};
8369 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8370 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8371 fe621944 2020-11-10 stsp nchanges++;
8373 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8374 2e1f37b0 2019-08-08 stsp int choice;
8375 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8376 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8377 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8378 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8380 2e1f37b0 2019-08-08 stsp goto done;
8381 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8382 2e1f37b0 2019-08-08 stsp have_content = 1;
8384 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8385 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8388 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8389 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8390 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8392 2e1f37b0 2019-08-08 stsp free(label1);
8393 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8394 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8396 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8397 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8398 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8399 2e1f37b0 2019-08-08 stsp if (staged_blob)
8400 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8401 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8402 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8403 fe621944 2020-11-10 stsp err = free_err;
8404 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8405 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8406 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8407 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8408 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8409 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8410 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8411 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8412 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8413 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8414 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8415 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8416 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8417 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8418 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8419 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8420 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8421 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8422 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8424 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8425 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8426 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8427 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8428 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8429 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8430 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8432 2e1f37b0 2019-08-08 stsp free(path1);
8433 2e1f37b0 2019-08-08 stsp free(path2);
8434 fda8017d 2020-07-23 stsp return err;
8437 fda8017d 2020-07-23 stsp static const struct got_error *
8438 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8439 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8440 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8441 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8442 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8443 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8444 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8446 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8447 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8448 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8449 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8450 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8451 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8452 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8453 fda8017d 2020-07-23 stsp struct stat sb;
8455 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8456 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8457 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8459 fda8017d 2020-07-23 stsp return err;
8461 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8462 fda8017d 2020-07-23 stsp return NULL;
8464 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8465 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8466 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8468 fda8017d 2020-07-23 stsp goto done;
8471 c56c5d8a 2021-12-31 thomas f = fopen(path_unstaged_content, "re");
8472 fda8017d 2020-07-23 stsp if (f == NULL) {
8473 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8474 fda8017d 2020-07-23 stsp path_unstaged_content);
8475 fda8017d 2020-07-23 stsp goto done;
8477 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8478 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8479 fda8017d 2020-07-23 stsp goto done;
8481 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8482 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8483 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8485 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8486 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8487 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8488 fda8017d 2020-07-23 stsp goto done;
8490 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8491 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8492 fda8017d 2020-07-23 stsp goto done;
8494 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8495 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8496 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8497 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8498 fda8017d 2020-07-23 stsp progress_arg);
8500 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8502 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8504 67a66647 2021-05-31 stsp return err;
8506 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8507 67a66647 2021-05-31 stsp parent) == -1) {
8508 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8509 67a66647 2021-05-31 stsp base_path = NULL;
8510 67a66647 2021-05-31 stsp goto done;
8513 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8515 67a66647 2021-05-31 stsp goto done;
8516 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8517 67a66647 2021-05-31 stsp blob_base);
8519 67a66647 2021-05-31 stsp goto done;
8522 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8523 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8525 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8526 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8527 eec2f5a9 2021-06-03 stsp ondisk_path);
8529 eec2f5a9 2021-06-03 stsp goto done;
8532 06340621 2021-12-31 thomas fd = open(ondisk_path,
8533 06340621 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8534 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8535 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8536 eec2f5a9 2021-06-03 stsp goto done;
8538 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8539 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8540 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8541 eec2f5a9 2021-06-03 stsp close(fd);
8542 eec2f5a9 2021-06-03 stsp goto done;
8546 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8547 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8548 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8549 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8550 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8553 fda8017d 2020-07-23 stsp goto done;
8555 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8556 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8557 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8559 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8560 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8563 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8564 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8565 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8566 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8567 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8568 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8569 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8570 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8571 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8572 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8573 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8574 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8575 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8576 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8577 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8578 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8579 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8580 67a66647 2021-05-31 stsp free(blob_base_path);
8581 67a66647 2021-05-31 stsp free(parent);
8582 67a66647 2021-05-31 stsp free(base_path);
8583 2e1f37b0 2019-08-08 stsp return err;
8586 ad493afc 2019-08-03 stsp static const struct got_error *
8587 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8588 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8589 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8590 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8592 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8593 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8594 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8595 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8596 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8597 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8598 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8599 9bc94a15 2019-08-03 stsp struct stat sb;
8600 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
8602 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8603 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8604 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8605 2e1f37b0 2019-08-08 stsp return NULL;
8607 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8608 ad493afc 2019-08-03 stsp if (ie == NULL)
8609 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8611 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8613 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8615 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8616 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8618 f69721c3 2019-10-21 stsp goto done;
8619 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8620 f69721c3 2019-10-21 stsp id_str) == -1) {
8621 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8622 f4ae6ddb 2022-07-01 thomas goto done;
8625 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
8626 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
8627 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8628 f4ae6ddb 2022-07-01 thomas goto done;
8630 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
8631 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
8632 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8633 f69721c3 2019-10-21 stsp goto done;
8636 ad493afc 2019-08-03 stsp switch (staged_status) {
8637 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8638 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8639 f4ae6ddb 2022-07-01 thomas blob_id, 8192, fd1);
8642 ad493afc 2019-08-03 stsp /* fall through */
8643 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8644 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8645 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8646 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8647 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8648 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8651 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8654 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8655 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8656 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8657 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8658 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8659 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8662 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8663 f4ae6ddb 2022-07-01 thomas staged_blob_id, 8192, fd2);
8666 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8667 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8668 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8669 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8670 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8671 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8672 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8673 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8674 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8676 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8677 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8678 36bf999c 2020-07-23 stsp char *staged_target;
8679 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8680 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8682 36bf999c 2020-07-23 stsp goto done;
8683 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8684 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8685 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8686 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8687 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8688 36bf999c 2020-07-23 stsp free(staged_target);
8690 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8691 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8692 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8693 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8694 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8695 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8696 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8700 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8703 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8704 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8705 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8706 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8709 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8710 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8711 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8712 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8713 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8716 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8718 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8719 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8723 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8724 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8725 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8726 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8729 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8733 ad493afc 2019-08-03 stsp free(ondisk_path);
8734 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8735 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8736 ad493afc 2019-08-03 stsp if (blob_base)
8737 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8738 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8739 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8740 ad493afc 2019-08-03 stsp if (blob_staged)
8741 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8742 f69721c3 2019-10-21 stsp free(id_str);
8743 f69721c3 2019-10-21 stsp free(label_orig);
8744 ad493afc 2019-08-03 stsp return err;
8747 ad493afc 2019-08-03 stsp const struct got_error *
8748 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8749 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8750 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8751 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8752 ad493afc 2019-08-03 stsp struct got_repository *repo)
8754 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8755 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8756 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8757 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8758 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8760 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8762 ad493afc 2019-08-03 stsp return err;
8764 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8766 ad493afc 2019-08-03 stsp goto done;
8768 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8769 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8770 ad493afc 2019-08-03 stsp upa.repo = repo;
8771 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8772 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8773 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8774 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8775 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8776 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8777 6092c299 2021-10-04 thomas unstage_path, &upa, NULL, NULL, 1, 0);
8779 ad493afc 2019-08-03 stsp goto done;
8782 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8783 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8784 ad493afc 2019-08-03 stsp err = sync_err;
8786 ad493afc 2019-08-03 stsp free(fileindex_path);
8787 ad493afc 2019-08-03 stsp if (fileindex)
8788 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8789 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8790 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8791 ad493afc 2019-08-03 stsp err = unlockerr;
8792 ad493afc 2019-08-03 stsp return err;
8795 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8796 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8797 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8798 b2118c49 2020-07-28 stsp void *info_arg;
8799 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8800 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8801 b2118c49 2020-07-28 stsp void *cancel_arg;
8804 b2118c49 2020-07-28 stsp static const struct got_error *
8805 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8807 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8808 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8809 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8810 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8811 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8812 b2118c49 2020-07-28 stsp int stage;
8814 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8815 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8817 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8818 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8819 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8822 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8823 b2118c49 2020-07-28 stsp return NULL;
8825 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8826 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8827 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8829 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8830 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8831 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8832 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8833 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8834 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8837 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8838 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8839 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8842 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8843 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8846 b2118c49 2020-07-28 stsp const struct got_error *
8847 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8848 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8849 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8850 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8853 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8854 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8855 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8856 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8858 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8860 b2118c49 2020-07-28 stsp return err;
8862 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8864 b2118c49 2020-07-28 stsp goto done;
8866 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8867 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8868 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8869 b2118c49 2020-07-28 stsp arg.paths = paths;
8870 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8871 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8872 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8875 b2118c49 2020-07-28 stsp free(fileindex_path);
8876 b2118c49 2020-07-28 stsp if (fileindex)
8877 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8878 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8879 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8880 b2118c49 2020-07-28 stsp err = unlockerr;
8881 b2118c49 2020-07-28 stsp return err;
8884 814624e7 2022-03-22 thomas static const struct got_error *
8885 814624e7 2022-03-22 thomas patch_check_path(const char *p, char **path, unsigned char *status,
8886 814624e7 2022-03-22 thomas unsigned char *staged_status, struct got_fileindex *fileindex,
8887 814624e7 2022-03-22 thomas struct got_worktree *worktree, struct got_repository *repo)
8889 814624e7 2022-03-22 thomas const struct got_error *err;
8890 814624e7 2022-03-22 thomas struct got_fileindex_entry *ie;
8891 814624e7 2022-03-22 thomas struct stat sb;
8892 814624e7 2022-03-22 thomas char *ondisk_path = NULL;
8894 814624e7 2022-03-22 thomas err = got_worktree_resolve_path(path, worktree, p);
8895 814624e7 2022-03-22 thomas if (err)
8896 814624e7 2022-03-22 thomas return err;
8898 814624e7 2022-03-22 thomas if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
8899 814624e7 2022-03-22 thomas *path[0] ? "/" : "", *path) == -1)
8900 814624e7 2022-03-22 thomas return got_error_from_errno("asprintf");
8902 814624e7 2022-03-22 thomas ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
8903 814624e7 2022-03-22 thomas if (ie) {
8904 814624e7 2022-03-22 thomas *staged_status = get_staged_status(ie);
8905 12de5570 2022-05-01 thomas err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
8907 814624e7 2022-03-22 thomas if (err)
8908 814624e7 2022-03-22 thomas goto done;
8909 814624e7 2022-03-22 thomas } else {
8910 814624e7 2022-03-22 thomas *staged_status = GOT_STATUS_NO_CHANGE;
8911 814624e7 2022-03-22 thomas *status = GOT_STATUS_UNVERSIONED;
8912 814624e7 2022-03-22 thomas if (lstat(ondisk_path, &sb) == -1) {
8913 814624e7 2022-03-22 thomas if (errno != ENOENT) {
8914 814624e7 2022-03-22 thomas err = got_error_from_errno2("lstat",
8915 814624e7 2022-03-22 thomas ondisk_path);
8916 814624e7 2022-03-22 thomas goto done;
8918 814624e7 2022-03-22 thomas *status = GOT_STATUS_NONEXISTENT;
8923 814624e7 2022-03-22 thomas free(ondisk_path);
8924 814624e7 2022-03-22 thomas return err;
8927 814624e7 2022-03-22 thomas static const struct got_error *
8928 814624e7 2022-03-22 thomas patch_can_rm(const char *path, unsigned char status,
8929 814624e7 2022-03-22 thomas unsigned char staged_status)
8931 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
8932 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
8933 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
8934 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
8935 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY &&
8936 814624e7 2022-03-22 thomas status != GOT_STATUS_MODE_CHANGE)
8937 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8938 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
8939 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8940 814624e7 2022-03-22 thomas return NULL;
8943 814624e7 2022-03-22 thomas static const struct got_error *
8944 814624e7 2022-03-22 thomas patch_can_add(const char *path, unsigned char status)
8946 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NONEXISTENT)
8947 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8948 814624e7 2022-03-22 thomas return NULL;
8951 814624e7 2022-03-22 thomas static const struct got_error *
8952 814624e7 2022-03-22 thomas patch_can_edit(const char *path, unsigned char status,
8953 814624e7 2022-03-22 thomas unsigned char staged_status)
8955 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
8956 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
8957 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
8958 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
8959 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY)
8960 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8961 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
8962 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8963 814624e7 2022-03-22 thomas return NULL;
8966 814624e7 2022-03-22 thomas const struct got_error *
8967 814624e7 2022-03-22 thomas got_worktree_patch_prepare(struct got_fileindex **fileindex,
8968 5e22b737 2022-05-31 thomas char **fileindex_path, struct got_worktree *worktree)
8970 5e22b737 2022-05-31 thomas return open_fileindex(fileindex, fileindex_path, worktree);
8973 814624e7 2022-03-22 thomas const struct got_error *
8974 814624e7 2022-03-22 thomas got_worktree_patch_check_path(const char *old, const char *new,
8975 814624e7 2022-03-22 thomas char **oldpath, char **newpath, struct got_worktree *worktree,
8976 814624e7 2022-03-22 thomas struct got_repository *repo, struct got_fileindex *fileindex)
8978 814624e7 2022-03-22 thomas const struct got_error *err = NULL;
8979 814624e7 2022-03-22 thomas int file_renamed = 0;
8980 814624e7 2022-03-22 thomas unsigned char status_old, staged_status_old;
8981 814624e7 2022-03-22 thomas unsigned char status_new, staged_status_new;
8983 814624e7 2022-03-22 thomas *oldpath = NULL;
8984 814624e7 2022-03-22 thomas *newpath = NULL;
8986 814624e7 2022-03-22 thomas err = patch_check_path(old != NULL ? old : new, oldpath,
8987 814624e7 2022-03-22 thomas &status_old, &staged_status_old, fileindex, worktree, repo);
8988 814624e7 2022-03-22 thomas if (err)
8989 814624e7 2022-03-22 thomas goto done;
8991 814624e7 2022-03-22 thomas err = patch_check_path(new != NULL ? new : old, newpath,
8992 814624e7 2022-03-22 thomas &status_new, &staged_status_new, fileindex, worktree, repo);
8993 814624e7 2022-03-22 thomas if (err)
8994 814624e7 2022-03-22 thomas goto done;
8996 814624e7 2022-03-22 thomas if (old != NULL && new != NULL && strcmp(old, new) != 0)
8997 814624e7 2022-03-22 thomas file_renamed = 1;
8999 814624e7 2022-03-22 thomas if (old != NULL && new == NULL)
9000 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
9001 814624e7 2022-03-22 thomas else if (file_renamed) {
9002 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
9003 814624e7 2022-03-22 thomas if (err == NULL)
9004 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
9005 814624e7 2022-03-22 thomas } else if (old == NULL)
9006 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
9008 814624e7 2022-03-22 thomas err = patch_can_edit(*newpath, status_new, staged_status_new);
9011 814624e7 2022-03-22 thomas if (err) {
9012 814624e7 2022-03-22 thomas free(*oldpath);
9013 814624e7 2022-03-22 thomas *oldpath = NULL;
9014 814624e7 2022-03-22 thomas free(*newpath);
9015 814624e7 2022-03-22 thomas *newpath = NULL;
9017 814624e7 2022-03-22 thomas return err;
9020 814624e7 2022-03-22 thomas const struct got_error *
9021 5e22b737 2022-05-31 thomas got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9022 5e22b737 2022-05-31 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
9023 5e22b737 2022-05-31 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
9025 5e22b737 2022-05-31 thomas struct schedule_addition_args saa;
9027 5e22b737 2022-05-31 thomas memset(&saa, 0, sizeof(saa));
9028 5e22b737 2022-05-31 thomas saa.worktree = worktree;
9029 5e22b737 2022-05-31 thomas saa.fileindex = fileindex;
9030 5e22b737 2022-05-31 thomas saa.progress_cb = progress_cb;
9031 5e22b737 2022-05-31 thomas saa.progress_arg = progress_arg;
9032 5e22b737 2022-05-31 thomas saa.repo = repo;
9034 5e22b737 2022-05-31 thomas return worktree_status(worktree, path, fileindex, repo,
9035 5e22b737 2022-05-31 thomas schedule_addition, &saa, NULL, NULL, 1, 0);
9038 5e22b737 2022-05-31 thomas const struct got_error *
9039 5e22b737 2022-05-31 thomas got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9040 5e22b737 2022-05-31 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
9041 5e22b737 2022-05-31 thomas got_worktree_delete_cb progress_cb, void *progress_arg)
9043 5e22b737 2022-05-31 thomas struct schedule_deletion_args sda;
9045 5e22b737 2022-05-31 thomas memset(&sda, 0, sizeof(sda));
9046 5e22b737 2022-05-31 thomas sda.worktree = worktree;
9047 5e22b737 2022-05-31 thomas sda.fileindex = fileindex;
9048 5e22b737 2022-05-31 thomas sda.progress_cb = progress_cb;
9049 5e22b737 2022-05-31 thomas sda.progress_arg = progress_arg;
9050 5e22b737 2022-05-31 thomas sda.repo = repo;
9051 5e22b737 2022-05-31 thomas sda.delete_local_mods = 0;
9052 5e22b737 2022-05-31 thomas sda.keep_on_disk = 0;
9053 5e22b737 2022-05-31 thomas sda.ignore_missing_paths = 0;
9054 5e22b737 2022-05-31 thomas sda.status_codes = NULL;
9056 5e22b737 2022-05-31 thomas return worktree_status(worktree, path, fileindex, repo,
9057 5e22b737 2022-05-31 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9060 5e22b737 2022-05-31 thomas const struct got_error *
9061 5e22b737 2022-05-31 thomas got_worktree_patch_complete(struct got_fileindex *fileindex,
9062 36832a8e 2022-05-31 thomas const char *fileindex_path)
9064 5e22b737 2022-05-31 thomas const struct got_error *err = NULL;
9066 36832a8e 2022-05-31 thomas err = sync_fileindex(fileindex, fileindex_path);
9067 36832a8e 2022-05-31 thomas got_fileindex_free(fileindex);
9069 5e22b737 2022-05-31 thomas return err;
