2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
19 133d2798 2019-01-08 stsp #include <sys/tree.h>
21 d1f6d47b 2019-02-04 stsp #include <dirent.h>
22 12ce7a6c 2019-08-12 stsp #include <limits.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 303e14b5 2019-09-23 stsp #include <time.h>
28 86c3caaf 2018-03-09 stsp #include <fcntl.h>
29 86c3caaf 2018-03-09 stsp #include <errno.h>
30 86c3caaf 2018-03-09 stsp #include <unistd.h>
31 9d31a1d8 2018-03-11 stsp #include <sha1.h>
32 5822e79e 2023-02-23 op #include <sha2.h>
33 9d31a1d8 2018-03-11 stsp #include <zlib.h>
34 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
35 512f0d0e 2019-01-02 stsp #include <libgen.h>
36 ec22038e 2019-03-10 stsp #include <uuid.h>
37 7154f6ce 2019-03-27 stsp #include <util.h>
39 86c3caaf 2018-03-09 stsp #include "got_error.h"
40 86c3caaf 2018-03-09 stsp #include "got_repository.h"
41 5261c201 2018-04-01 stsp #include "got_reference.h"
42 9d31a1d8 2018-03-11 stsp #include "got_object.h"
43 1dd54920 2019-05-11 stsp #include "got_path.h"
44 e6209546 2019-08-22 stsp #include "got_cancel.h"
45 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
46 511a516b 2018-05-19 stsp #include "got_opentemp.h"
47 234035bc 2019-06-01 stsp #include "got_diff.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
50 53bf0b54 2023-02-23 op #include "got_lib_hash.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
52 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
53 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
54 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
55 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
56 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
57 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
58 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
59 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
62 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
65 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
66 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
68 b2b3fce1 2022-10-29 op static mode_t apply_umask(mode_t);
70 99724ed4 2018-03-10 stsp static const struct got_error *
71 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
73 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
76 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
77 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
79 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
84 507dc3bb 2018-12-29 stsp static const struct got_error *
85 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
87 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
88 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
89 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
90 507dc3bb 2018-12-29 stsp char *path = NULL;
92 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
93 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
94 507dc3bb 2018-12-29 stsp path = NULL;
98 b90054ed 2022-11-01 stsp err = got_opentemp_named(&tmppath, &tmpfile, path, "");
102 507dc3bb 2018-12-29 stsp if (content) {
103 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
104 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
105 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
110 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
111 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
112 2a57020b 2019-02-20 stsp unlink(tmppath);
117 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
118 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
119 230a42bd 2019-05-11 jcs free(tmppath);
120 09fe317a 2018-03-11 stsp return err;
123 024e9686 2019-05-14 stsp static const struct got_error *
124 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
126 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
127 024e9686 2019-05-14 stsp char *refstr = NULL;
129 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
130 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
131 024e9686 2019-05-14 stsp if (refstr == NULL)
132 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
134 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
135 024e9686 2019-05-14 stsp if (refstr == NULL)
136 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
138 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
139 024e9686 2019-05-14 stsp free(refstr);
140 024e9686 2019-05-14 stsp return err;
143 86c3caaf 2018-03-09 stsp const struct got_error *
144 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
145 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
147 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
148 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
149 ec22038e 2019-03-10 stsp uuid_t uuid;
150 ec22038e 2019-03-10 stsp uint32_t uuid_status;
151 65596e15 2018-12-24 stsp int obj_type;
152 7ac97322 2018-03-11 stsp char *path_got = NULL;
153 1451e70d 2018-03-10 stsp char *formatstr = NULL;
154 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
155 65596e15 2018-12-24 stsp char *basestr = NULL;
156 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
158 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
159 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
163 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
165 65596e15 2018-12-24 stsp return err;
166 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
168 65596e15 2018-12-24 stsp return err;
169 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
170 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
172 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
173 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
174 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
177 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
178 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
179 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
183 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
184 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
185 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
188 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
189 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
193 056e7441 2018-03-11 stsp /* Create an empty lock file. */
194 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
198 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
199 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
203 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
204 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
208 65596e15 2018-12-24 stsp /* Record our base commit. */
209 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
212 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
216 1451e70d 2018-03-10 stsp /* Store path to repository. */
217 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
218 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
222 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
223 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
224 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
228 ec22038e 2019-03-10 stsp /* Generate UUID. */
229 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
230 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
231 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
234 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
235 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
236 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
239 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
243 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
244 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
245 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
248 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
253 65596e15 2018-12-24 stsp free(commit_id);
254 7ac97322 2018-03-11 stsp free(path_got);
255 1451e70d 2018-03-10 stsp free(formatstr);
256 0bb8a95e 2018-03-12 stsp free(absprefix);
257 65596e15 2018-12-24 stsp free(basestr);
258 ec22038e 2019-03-10 stsp free(uuidstr);
259 86c3caaf 2018-03-09 stsp return err;
262 247140b2 2019-02-05 stsp const struct got_error *
263 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
264 e5dc7198 2018-12-29 stsp const char *path_prefix)
266 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
268 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
269 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
270 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
272 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
273 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
274 e5dc7198 2018-12-29 stsp free(absprefix);
275 e5dc7198 2018-12-29 stsp return NULL;
278 bc70eb79 2019-05-09 stsp const char *
279 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
281 36a38700 2019-05-10 stsp return worktree->head_ref_name;
284 024e9686 2019-05-14 stsp const struct got_error *
285 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
286 024e9686 2019-05-14 stsp struct got_reference *head_ref)
288 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
289 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
291 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
292 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
293 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
294 024e9686 2019-05-14 stsp path_got = NULL;
298 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
299 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
300 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
304 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
308 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
309 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
311 024e9686 2019-05-14 stsp free(path_got);
313 024e9686 2019-05-14 stsp free(head_ref_name);
314 024e9686 2019-05-14 stsp return err;
317 b72f483a 2019-02-05 stsp struct got_object_id *
318 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
320 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
323 507dc3bb 2018-12-29 stsp const struct got_error *
324 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
325 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
327 507dc3bb 2018-12-29 stsp const struct got_error *err;
328 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
329 507dc3bb 2018-12-29 stsp char *id_str = NULL;
330 507dc3bb 2018-12-29 stsp char *path_got = NULL;
332 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
333 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
334 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
335 507dc3bb 2018-12-29 stsp path_got = NULL;
339 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
341 507dc3bb 2018-12-29 stsp return err;
343 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
344 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
348 507dc3bb 2018-12-29 stsp /* Record our base commit. */
349 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
352 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
356 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
357 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
358 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
359 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
364 507dc3bb 2018-12-29 stsp got_object_close(obj);
365 507dc3bb 2018-12-29 stsp free(id_str);
366 507dc3bb 2018-12-29 stsp free(path_got);
367 507dc3bb 2018-12-29 stsp return err;
370 50b0790e 2020-09-11 stsp const struct got_gotconfig *
371 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
373 50b0790e 2020-09-11 stsp return worktree->gotconfig;
376 9d31a1d8 2018-03-11 stsp static const struct got_error *
377 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
379 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
380 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
381 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
382 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
383 86c3caaf 2018-03-09 stsp return NULL;
386 21908da4 2019-01-13 stsp static const struct got_error *
387 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
389 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
390 4a1ddfc2 2019-01-12 stsp char *abspath;
392 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
393 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
395 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
396 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
397 ddcd8544 2019-03-11 stsp struct stat sb;
398 ddcd8544 2019-03-11 stsp err = NULL;
399 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
400 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
401 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
402 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
403 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
406 4a1ddfc2 2019-01-12 stsp free(abspath);
407 68c76935 2019-02-19 stsp return err;
410 68c76935 2019-02-19 stsp static const struct got_error *
411 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
413 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
414 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
415 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
416 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
421 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
422 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
423 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
426 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
427 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
428 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
431 68c76935 2019-02-19 stsp if (flen1 == 0) {
432 68c76935 2019-02-19 stsp if (flen2 != 0)
435 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
436 68c76935 2019-02-19 stsp if (flen1 != 0)
439 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
440 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
450 68c76935 2019-02-19 stsp return err;
453 68c76935 2019-02-19 stsp static const struct got_error *
454 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
456 68c76935 2019-02-19 stsp struct stat sb;
457 68c76935 2019-02-19 stsp size_t size1, size2;
461 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
462 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
463 68c76935 2019-02-19 stsp size1 = sb.st_size;
465 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
466 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
467 68c76935 2019-02-19 stsp size2 = sb.st_size;
469 68c76935 2019-02-19 stsp if (size1 != size2) {
471 68c76935 2019-02-19 stsp return NULL;
474 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
475 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
476 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
477 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
479 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
482 0e039681 2021-11-15 stsp static const struct got_error *
483 0e039681 2021-11-15 stsp copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
485 0e039681 2021-11-15 stsp uint8_t fbuf[65536];
486 0e039681 2021-11-15 stsp size_t flen;
487 0e039681 2021-11-15 stsp ssize_t outlen;
489 0e039681 2021-11-15 stsp *outsize = 0;
491 0e039681 2021-11-15 stsp if (fseek(f, 0L, SEEK_SET) == -1)
492 0e039681 2021-11-15 stsp return got_ferror(f, GOT_ERR_IO);
495 0e039681 2021-11-15 stsp flen = fread(fbuf, 1, sizeof(fbuf), f);
496 0e039681 2021-11-15 stsp if (flen == 0) {
497 0e039681 2021-11-15 stsp if (ferror(f))
498 0e039681 2021-11-15 stsp return got_error_from_errno("fread");
499 0e039681 2021-11-15 stsp if (feof(f))
502 0e039681 2021-11-15 stsp outlen = write(outfd, fbuf, flen);
503 0e039681 2021-11-15 stsp if (outlen == -1)
504 0e039681 2021-11-15 stsp return got_error_from_errno("write");
505 0e039681 2021-11-15 stsp if (outlen != flen)
506 0e039681 2021-11-15 stsp return got_error(GOT_ERR_IO);
507 0e039681 2021-11-15 stsp *outsize += outlen;
510 0e039681 2021-11-15 stsp return NULL;
513 0e039681 2021-11-15 stsp static const struct got_error *
514 0e039681 2021-11-15 stsp merge_binary_file(int *overlapcnt, int merged_fd,
515 0e039681 2021-11-15 stsp FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
516 0e039681 2021-11-15 stsp const char *label_deriv, const char *label_orig, const char *label_deriv2,
517 0e039681 2021-11-15 stsp const char *ondisk_path)
519 0e039681 2021-11-15 stsp const struct got_error *err = NULL;
520 0e039681 2021-11-15 stsp int same_content, changed_deriv, changed_deriv2;
521 0e039681 2021-11-15 stsp int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
522 0e039681 2021-11-15 stsp off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
523 0e039681 2021-11-15 stsp char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
524 0e039681 2021-11-15 stsp char *base_path_orig = NULL, *base_path_deriv = NULL;
525 0e039681 2021-11-15 stsp char *base_path_deriv2 = NULL;
527 0e039681 2021-11-15 stsp *overlapcnt = 0;
529 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_deriv2);
531 0e039681 2021-11-15 stsp return err;
533 0e039681 2021-11-15 stsp if (same_content)
534 0e039681 2021-11-15 stsp return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
536 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_orig);
538 0e039681 2021-11-15 stsp return err;
539 0e039681 2021-11-15 stsp changed_deriv = !same_content;
540 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv2, f_orig);
542 0e039681 2021-11-15 stsp return err;
543 0e039681 2021-11-15 stsp changed_deriv2 = !same_content;
545 0e039681 2021-11-15 stsp if (changed_deriv && changed_deriv2) {
546 0e039681 2021-11-15 stsp *overlapcnt = 1;
547 0e039681 2021-11-15 stsp if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
548 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
551 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
552 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
555 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
556 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
559 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_orig, &fd_orig,
560 b90054ed 2022-11-01 stsp base_path_orig, "");
563 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
564 b90054ed 2022-11-01 stsp base_path_deriv, "");
567 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
568 b90054ed 2022-11-01 stsp base_path_deriv2, "");
571 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
574 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
577 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
580 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "Binary files differ and cannot be "
581 0e039681 2021-11-15 stsp "merged automatically:\n") < 0) {
582 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
585 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
586 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
587 0e039681 2021-11-15 stsp label_deriv ? " " : "",
588 0e039681 2021-11-15 stsp label_deriv ? label_deriv : "",
589 0e039681 2021-11-15 stsp path_deriv) < 0) {
590 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
593 0e039681 2021-11-15 stsp if (size_orig > 0) {
594 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
595 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_ORIG,
596 0e039681 2021-11-15 stsp label_orig ? " " : "",
597 0e039681 2021-11-15 stsp label_orig ? label_orig : "",
598 0e039681 2021-11-15 stsp path_orig) < 0) {
599 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
603 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
604 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
605 0e039681 2021-11-15 stsp path_deriv2,
606 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_END,
607 0e039681 2021-11-15 stsp label_deriv2 ? " " : "",
608 0e039681 2021-11-15 stsp label_deriv2 ? label_deriv2 : "") < 0) {
609 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
612 0e039681 2021-11-15 stsp } else if (changed_deriv)
613 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
614 0e039681 2021-11-15 stsp else if (changed_deriv2)
615 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
617 0e039681 2021-11-15 stsp if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
618 0e039681 2021-11-15 stsp err == NULL)
619 0e039681 2021-11-15 stsp err = got_error_from_errno2("unlink", path_orig);
620 0e039681 2021-11-15 stsp if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
621 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_orig);
622 0e039681 2021-11-15 stsp if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
623 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv);
624 0e039681 2021-11-15 stsp if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
625 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv2);
626 0e039681 2021-11-15 stsp free(path_orig);
627 0e039681 2021-11-15 stsp free(path_deriv);
628 0e039681 2021-11-15 stsp free(path_deriv2);
629 0e039681 2021-11-15 stsp free(base_path_orig);
630 0e039681 2021-11-15 stsp free(base_path_deriv);
631 0e039681 2021-11-15 stsp free(base_path_deriv2);
632 0e039681 2021-11-15 stsp return err;
636 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
637 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
638 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
639 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
640 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
642 6353ad76 2019-02-08 stsp static const struct got_error *
643 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
644 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
645 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
646 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
647 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
648 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
650 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
651 6353ad76 2019-02-08 stsp int merged_fd = -1;
652 db590691 2021-06-02 stsp FILE *f_merged = NULL;
653 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
654 234035bc 2019-06-01 stsp int overlapcnt = 0;
655 3524bbf9 2020-10-20 stsp char *parent = NULL;
657 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
659 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
661 3524bbf9 2020-10-20 stsp return err;
663 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
664 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
668 b90054ed 2022-11-01 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
672 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
673 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
675 0e039681 2021-11-15 stsp if (err->code != GOT_ERR_FILE_BINARY)
677 0e039681 2021-11-15 stsp err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
678 0e039681 2021-11-15 stsp f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
679 0e039681 2021-11-15 stsp ondisk_path);
684 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
685 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
689 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
690 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
694 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
695 db590691 2021-06-02 stsp if (f_merged == NULL) {
696 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
699 db590691 2021-06-02 stsp merged_fd = -1;
701 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
702 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
703 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
709 b2b3fce1 2022-10-29 op if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
710 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
714 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
715 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
716 230a42bd 2019-05-11 jcs ondisk_path);
721 fdcb7daf 2019-12-15 stsp if (merged_path)
722 fdcb7daf 2019-12-15 stsp unlink(merged_path);
724 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
725 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
726 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
727 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
728 6353ad76 2019-02-08 stsp free(merged_path);
729 af54ae4a 2019-02-19 stsp free(base_path);
730 3524bbf9 2020-10-20 stsp free(parent);
731 af57b12a 2020-07-23 stsp return err;
734 af57b12a 2020-07-23 stsp static const struct got_error *
735 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
736 af57b12a 2020-07-23 stsp size_t target_len)
738 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
739 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
740 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
741 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
742 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
743 af57b12a 2020-07-23 stsp ondisk_path);
744 af57b12a 2020-07-23 stsp return NULL;
748 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
749 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
750 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
751 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
753 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
754 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
756 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
757 993e2a1b 2020-07-23 stsp * has deleted this symlink.
759 11cc08c1 2020-07-23 stsp static const struct got_error *
760 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
761 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
762 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
764 11cc08c1 2020-07-23 stsp const struct got_error *err;
765 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
766 11cc08c1 2020-07-23 stsp FILE *f = NULL;
768 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
770 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
772 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
773 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
774 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
778 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
780 3818e3c4 2020-11-01 naddy goto done;
782 b2b3fce1 2022-10-29 op if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
783 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
787 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
788 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
789 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
790 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
791 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
792 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
793 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
794 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
795 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
796 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
800 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
801 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
804 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
805 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
809 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
810 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
811 11cc08c1 2020-07-23 stsp free(path);
812 11cc08c1 2020-07-23 stsp free(id_str);
813 11cc08c1 2020-07-23 stsp free(label_deriv);
814 11cc08c1 2020-07-23 stsp return err;
817 d219f183 2020-07-23 stsp /* forward declaration */
818 d219f183 2020-07-23 stsp static const struct got_error *
819 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
820 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
821 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
822 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
825 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
826 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
827 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
828 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
830 af57b12a 2020-07-23 stsp static const struct got_error *
831 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
832 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
833 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
834 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
835 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
837 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
838 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
839 af57b12a 2020-07-23 stsp struct stat sb;
840 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
841 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
842 11cc08c1 2020-07-23 stsp int have_local_change = 0;
843 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
845 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
846 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
848 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
849 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
850 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
851 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
852 af57b12a 2020-07-23 stsp ondisk_path);
855 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
857 526a746f 2020-07-23 stsp if (blob_orig) {
858 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
863 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
864 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
865 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
866 11cc08c1 2020-07-23 stsp have_local_change = 1;
868 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
869 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
870 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
871 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
872 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
874 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
875 11cc08c1 2020-07-23 stsp if (ancestor_target) {
876 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
877 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
879 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
880 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
881 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
882 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
885 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
886 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
887 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
888 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
891 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
894 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
895 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
896 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
897 af57b12a 2020-07-23 stsp strlen(deriv_target));
900 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
901 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
902 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
903 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
904 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
905 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
908 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
909 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
910 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
913 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
919 af57b12a 2020-07-23 stsp free(ancestor_target);
920 eec2f5a9 2021-06-03 stsp return err;
923 eec2f5a9 2021-06-03 stsp static const struct got_error *
924 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
926 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
927 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
928 eec2f5a9 2021-06-03 stsp ssize_t target_len;
932 eec2f5a9 2021-06-03 stsp *outfile = NULL;
934 eec2f5a9 2021-06-03 stsp f = got_opentemp();
935 eec2f5a9 2021-06-03 stsp if (f == NULL)
936 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
937 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
938 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
939 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
942 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
943 eec2f5a9 2021-06-03 stsp if (n != target_len) {
944 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
947 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
948 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
951 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
952 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
959 eec2f5a9 2021-06-03 stsp *outfile = f;
960 14c901f1 2019-08-08 stsp return err;
964 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
965 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
966 14c901f1 2019-08-08 stsp * acts as the second derived version.
968 14c901f1 2019-08-08 stsp static const struct got_error *
969 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
970 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
971 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
972 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
973 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
974 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
976 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
977 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
978 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
979 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
980 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
982 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
984 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
986 ed6b5030 2020-10-20 stsp return err;
988 67a66647 2021-05-31 stsp if (blob_orig) {
989 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
990 67a66647 2021-05-31 stsp parent) == -1) {
991 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
992 67a66647 2021-05-31 stsp base_path = NULL;
996 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_orig_path, &f_orig,
997 b90054ed 2022-11-01 stsp base_path, "");
1000 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1001 67a66647 2021-05-31 stsp blob_orig);
1003 67a66647 2021-05-31 stsp goto done;
1004 67a66647 2021-05-31 stsp free(base_path);
1007 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1008 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1009 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1011 db590691 2021-06-02 stsp f_orig = got_opentemp();
1012 db590691 2021-06-02 stsp if (f_orig == NULL) {
1013 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1014 db590691 2021-06-02 stsp goto done;
1018 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1019 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1020 14c901f1 2019-08-08 stsp base_path = NULL;
1021 14c901f1 2019-08-08 stsp goto done;
1024 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1026 14c901f1 2019-08-08 stsp goto done;
1027 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1028 14c901f1 2019-08-08 stsp blob_deriv);
1030 14c901f1 2019-08-08 stsp goto done;
1032 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1034 14c901f1 2019-08-08 stsp goto done;
1035 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1036 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1037 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1038 14c901f1 2019-08-08 stsp goto done;
1042 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1043 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1045 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1046 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1048 eec2f5a9 2021-06-03 stsp goto done;
1051 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1052 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1053 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1054 eec2f5a9 2021-06-03 stsp goto done;
1056 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1057 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1058 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1059 eec2f5a9 2021-06-03 stsp close(fd);
1060 eec2f5a9 2021-06-03 stsp goto done;
1064 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1065 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1066 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1068 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1069 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1070 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1071 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1072 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1073 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1074 14c901f1 2019-08-08 stsp free(base_path);
1075 67a66647 2021-05-31 stsp if (blob_orig_path) {
1076 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1077 67a66647 2021-05-31 stsp free(blob_orig_path);
1079 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1080 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1081 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1083 6353ad76 2019-02-08 stsp free(id_str);
1084 818c7501 2019-07-11 stsp free(label_deriv);
1085 ed6b5030 2020-10-20 stsp free(parent);
1086 4a1ddfc2 2019-01-12 stsp return err;
1089 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1090 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1091 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1092 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1094 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1095 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1097 65b05cec 2020-07-23 stsp *new_iep = NULL;
1099 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1101 054041d0 2020-06-24 stsp return err;
1103 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1104 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1106 054041d0 2020-06-24 stsp goto done;
1108 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1111 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1113 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1114 13d9040b 2019-03-27 stsp return err;
1117 1ebedb77 2019-10-19 stsp static mode_t
1118 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1120 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1122 1ebedb77 2019-10-19 stsp if (executable) {
1123 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1124 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1125 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1126 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1127 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1128 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1131 b2b3fce1 2022-10-29 op return st_mode;
1134 b2b3fce1 2022-10-29 op static mode_t
1135 b2b3fce1 2022-10-29 op apply_umask(mode_t mode)
1139 b2b3fce1 2022-10-29 op um = umask(000);
1141 b2b3fce1 2022-10-29 op return mode & ~um;
1144 8ba819a3 2020-07-23 stsp /* forward declaration */
1145 13d9040b 2019-03-27 stsp static const struct got_error *
1146 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1147 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1148 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1149 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1150 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1151 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1154 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1155 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1157 8ba819a3 2020-07-23 stsp static const struct got_error *
1158 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1159 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1161 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1162 5a1fbc73 2020-07-23 stsp ssize_t elen;
1163 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1166 c6e8a826 2021-04-05 stsp *did_something = 0;
1169 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1170 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1171 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1172 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1173 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1174 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1176 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1177 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1178 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink())
1179 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1181 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1182 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1183 5a1fbc73 2020-07-23 stsp if (elen == -1)
1184 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1186 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1187 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1188 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1191 c6e8a826 2021-04-05 stsp *did_something = 1;
1192 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1193 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1194 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1195 5a1fbc73 2020-07-23 stsp return err;
1198 3c1ec782 2020-07-23 stsp static const struct got_error *
1199 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1200 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1202 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1203 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1204 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1206 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1208 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1209 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1210 3c1ec782 2020-07-23 stsp return NULL;
1214 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1215 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1216 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1217 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1218 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1220 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1221 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1222 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1224 ce031e9e 2020-10-20 stsp return err;
1225 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1226 ce031e9e 2020-10-20 stsp free(parent);
1227 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1229 ce031e9e 2020-10-20 stsp free(parent);
1230 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1231 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1232 3c1ec782 2020-07-23 stsp free(abspath);
1233 3c1ec782 2020-07-23 stsp return err;
1235 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1236 3c1ec782 2020-07-23 stsp free(abspath);
1238 3c1ec782 2020-07-23 stsp return err;
1240 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1242 3c1ec782 2020-07-23 stsp return err;
1245 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1246 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1247 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1248 3c1ec782 2020-07-23 stsp return NULL;
1251 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1252 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1253 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1254 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1255 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1256 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1258 3c1ec782 2020-07-23 stsp free(path_got);
1259 3c1ec782 2020-07-23 stsp return NULL;
1262 5a1fbc73 2020-07-23 stsp static const struct got_error *
1263 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1264 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1265 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1266 5267b9e4 2021-09-26 stsp int path_is_unversioned, int allow_bad_symlinks,
1267 5267b9e4 2021-09-26 stsp struct got_repository *repo,
1268 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1270 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1271 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1272 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1273 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1274 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1276 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1279 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1280 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1281 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1282 8ba819a3 2020-07-23 stsp * in the blob object.
1285 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1286 538b6881 2022-07-21 florian if (err)
1287 538b6881 2022-07-21 florian return err;
1289 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1290 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1291 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1292 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1293 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1294 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1295 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1296 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1297 3b9f0f87 2020-07-23 stsp progress_arg);
1299 8ba819a3 2020-07-23 stsp if (len > 0) {
1300 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1301 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1302 8ba819a3 2020-07-23 stsp len - hdrlen);
1303 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1304 8ba819a3 2020-07-23 stsp hdrlen = 0;
1306 8ba819a3 2020-07-23 stsp } while (len != 0);
1307 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1309 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1310 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1312 3c1ec782 2020-07-23 stsp return err;
1314 5267b9e4 2021-09-26 stsp if (*is_bad_symlink && !allow_bad_symlinks) {
1315 906c123b 2020-07-23 stsp /* install as a regular file */
1316 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1317 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1318 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1319 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1320 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1321 3c29341b 2022-07-21 florian return err;
1324 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1325 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1326 c6e8a826 2021-04-05 stsp int symlink_replaced;
1327 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1328 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1329 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1330 3c29341b 2022-07-21 florian return err;
1332 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1333 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1335 3c29341b 2022-07-21 florian return err;
1336 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1337 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1338 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1339 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1340 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1341 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1343 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1344 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1347 3c29341b 2022-07-21 florian return err; /* Nothing else to do. */
1350 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1351 f4994adc 2020-10-20 stsp char *parent;
1352 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1354 3c29341b 2022-07-21 florian return err;
1355 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1356 f4994adc 2020-10-20 stsp free(parent);
1358 3c29341b 2022-07-21 florian return err;
1360 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1361 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1363 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1364 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1365 3c29341b 2022-07-21 florian return err;
1369 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1370 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1371 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1372 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1373 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1374 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1375 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1376 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1377 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1378 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1379 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1380 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1381 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1383 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1384 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1386 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1387 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1388 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1389 8ba819a3 2020-07-23 stsp return err;
1392 8ba819a3 2020-07-23 stsp static const struct got_error *
1393 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1394 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1395 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1396 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1397 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1398 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1400 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1401 507dc3bb 2018-12-29 stsp int fd = -1;
1402 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1403 507dc3bb 2018-12-29 stsp int update = 0;
1404 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1405 b2b3fce1 2022-10-29 op mode_t mode;
1407 b2b3fce1 2022-10-29 op mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1408 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1409 b2b3fce1 2022-10-29 op O_CLOEXEC, mode);
1410 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1411 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1412 f5375317 2020-10-20 stsp char *parent;
1413 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1415 f5375317 2020-10-20 stsp return err;
1416 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1417 f5375317 2020-10-20 stsp free(parent);
1419 21908da4 2019-01-13 stsp return err;
1420 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1421 8bd0cdad 2021-12-31 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1423 21908da4 2019-01-13 stsp if (fd == -1)
1424 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1425 230a42bd 2019-05-11 jcs ondisk_path);
1426 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1427 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1428 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1429 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1430 3b9f0f87 2020-07-23 stsp goto done;
1432 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1433 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1434 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1435 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1436 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1437 507dc3bb 2018-12-29 stsp goto done;
1439 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1440 b90054ed 2022-11-01 stsp ondisk_path, "");
1442 507dc3bb 2018-12-29 stsp goto done;
1443 507dc3bb 2018-12-29 stsp update = 1;
1445 b2b3fce1 2022-10-29 op if (fchmod(fd, apply_umask(mode)) == -1) {
1446 b2b3fce1 2022-10-29 op err = got_error_from_errno2("fchmod",
1452 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1455 bd6aa359 2020-07-23 stsp if (progress_cb) {
1456 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1457 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1459 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1460 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1463 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1464 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1466 bd6aa359 2020-07-23 stsp goto done;
1469 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1471 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1472 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1475 9d31a1d8 2018-03-11 stsp if (len > 0) {
1476 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1477 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1478 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1479 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1480 b87c6f83 2018-12-24 stsp goto done;
1481 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1482 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1483 b87c6f83 2018-12-24 stsp goto done;
1485 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1487 9d31a1d8 2018-03-11 stsp } while (len != 0);
1489 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1490 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1491 816dc654 2019-02-16 stsp goto done;
1494 507dc3bb 2018-12-29 stsp if (update) {
1495 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1496 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1497 f6d8c0ac 2020-11-09 stsp goto done;
1499 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1500 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1501 230a42bd 2019-05-11 jcs ondisk_path);
1502 68ed9ba5 2019-02-10 stsp goto done;
1504 63df146d 2020-11-09 stsp free(tmppath);
1505 63df146d 2020-11-09 stsp tmppath = NULL;
1509 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1510 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1511 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1512 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1513 507dc3bb 2018-12-29 stsp free(tmppath);
1514 6353ad76 2019-02-08 stsp return err;
1518 12383673 2023-02-18 mark * Upgrade STATUS_MODIFY to STATUS_CONFLICT if a
1519 12383673 2023-02-18 mark * conflict marker is found in newly added lines only.
1521 6353ad76 2019-02-08 stsp static const struct got_error *
1522 12383673 2023-02-18 mark get_modified_file_content_status(unsigned char *status,
1523 12383673 2023-02-18 mark struct got_blob_object *blob, const char *path, struct stat *sb,
1524 12383673 2023-02-18 mark FILE *ondisk_file)
1526 d952957d 2023-02-19 mark const struct got_error *err, *free_err;
1527 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1528 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1529 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1530 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1532 d952957d 2023-02-19 mark FILE *f1 = NULL;
1533 d952957d 2023-02-19 mark struct got_diffreg_result *diffreg_result = NULL;
1534 d952957d 2023-02-19 mark struct diff_result *r;
1535 d952957d 2023-02-19 mark int nchunks_parsed, n, i = 0, ln = 0;
1536 9bdd68dd 2021-01-02 naddy char *line = NULL;
1537 9bdd68dd 2021-01-02 naddy size_t linesize = 0;
1538 9bdd68dd 2021-01-02 naddy ssize_t linelen;
1540 d952957d 2023-02-19 mark if (*status != GOT_STATUS_MODIFY)
1541 d952957d 2023-02-19 mark return NULL;
1543 d952957d 2023-02-19 mark f1 = got_opentemp();
1544 d952957d 2023-02-19 mark if (f1 == NULL)
1545 d952957d 2023-02-19 mark return got_error_from_errno("got_opentemp");
1547 d952957d 2023-02-19 mark if (blob) {
1548 d952957d 2023-02-19 mark got_object_blob_rewind(blob);
1549 d952957d 2023-02-19 mark err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
1551 12383673 2023-02-18 mark goto done;
1554 d952957d 2023-02-19 mark err = got_diff_files(&diffreg_result, f1, 1, NULL, ondisk_file,
1555 d952957d 2023-02-19 mark 1, NULL, 0, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
1557 d952957d 2023-02-19 mark goto done;
1559 d952957d 2023-02-19 mark r = diffreg_result->result;
1561 d952957d 2023-02-19 mark for (n = 0; n < r->chunks.len; n += nchunks_parsed) {
1562 d952957d 2023-02-19 mark struct diff_chunk *c;
1563 d952957d 2023-02-19 mark struct diff_chunk_context cc = {};
1564 7783f73c 2023-02-20 mark off_t pos;
1567 d952957d 2023-02-19 mark * We can optimise a little by advancing straight
1568 d952957d 2023-02-19 mark * to the next chunk if this one has no added lines.
1570 d952957d 2023-02-19 mark c = diff_chunk_get(r, n);
1572 45e6b2f4 2023-02-20 mark if (diff_chunk_type(c) != CHUNK_PLUS) {
1573 d952957d 2023-02-19 mark nchunks_parsed = 1;
1574 7783f73c 2023-02-20 mark continue; /* removed or unchanged lines */
1577 7783f73c 2023-02-20 mark pos = diff_chunk_get_right_start_pos(c);
1578 7783f73c 2023-02-20 mark if (fseek(ondisk_file, pos, SEEK_SET) == -1) {
1579 7783f73c 2023-02-20 mark err = got_ferror(ondisk_file, GOT_ERR_IO);
1580 7783f73c 2023-02-20 mark goto done;
1583 7783f73c 2023-02-20 mark diff_chunk_context_load_change(&cc, &nchunks_parsed, r, n, 0);
1584 7783f73c 2023-02-20 mark ln = cc.right.start;
1586 d952957d 2023-02-19 mark while (ln < cc.right.end) {
1587 d952957d 2023-02-19 mark linelen = getline(&line, &linesize, ondisk_file);
1588 d952957d 2023-02-19 mark if (linelen == -1) {
1589 d952957d 2023-02-19 mark if (feof(ondisk_file))
1591 d952957d 2023-02-19 mark err = got_ferror(ondisk_file, GOT_ERR_IO);
1595 d952957d 2023-02-19 mark if (line && strncmp(line, markers[i],
1596 d952957d 2023-02-19 mark strlen(markers[i])) == 0) {
1597 d952957d 2023-02-19 mark if (strcmp(markers[i],
1598 d952957d 2023-02-19 mark GOT_DIFF_CONFLICT_MARKER_END) == 0) {
1599 d952957d 2023-02-19 mark *status = GOT_STATUS_CONFLICT;
1600 d952957d 2023-02-19 mark goto done;
1609 9bdd68dd 2021-01-02 naddy free(line);
1610 12383673 2023-02-18 mark if (f1 != NULL && fclose(f1) == EOF && err == NULL)
1611 12383673 2023-02-18 mark err = got_error_from_errno("fclose");
1612 d952957d 2023-02-19 mark free_err = got_diffreg_result_free(diffreg_result);
1613 d952957d 2023-02-19 mark if (err == NULL)
1614 d952957d 2023-02-19 mark err = free_err;
1616 7154f6ce 2019-03-27 stsp return err;
1619 e2b1e152 2019-07-13 stsp static int
1620 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1622 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1623 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1626 1ebedb77 2019-10-19 stsp static int
1627 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1629 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1630 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1631 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1632 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1633 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1634 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1637 c363b2c1 2019-08-03 stsp static unsigned char
1638 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1640 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1641 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1642 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1643 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1644 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1645 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1646 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1648 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1652 a919d5c4 2020-07-23 stsp static const struct got_error *
1653 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1654 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1655 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1657 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1658 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1659 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1660 a919d5c4 2020-07-23 stsp ssize_t elen;
1661 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1662 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1663 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1665 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1667 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1669 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1671 a919d5c4 2020-07-23 stsp return err;
1672 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1674 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1675 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1677 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1679 a919d5c4 2020-07-23 stsp if (len > 0) {
1680 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1681 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1682 a919d5c4 2020-07-23 stsp len - hdrlen);
1683 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1684 a919d5c4 2020-07-23 stsp hdrlen = 0;
1686 a919d5c4 2020-07-23 stsp } while (len != 0);
1687 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1689 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1690 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1691 a919d5c4 2020-07-23 stsp if (elen == -1)
1692 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1694 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1695 a919d5c4 2020-07-23 stsp if (elen == -1)
1696 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1699 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1700 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1702 a919d5c4 2020-07-23 stsp return NULL;
1705 7154f6ce 2019-03-27 stsp static const struct got_error *
1706 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1707 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1708 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1710 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1711 6353ad76 2019-02-08 stsp struct got_object_id id;
1712 6353ad76 2019-02-08 stsp size_t hdrlen;
1713 eb81bc23 2022-06-28 tracey int fd = -1, fd1 = -1;
1714 6353ad76 2019-02-08 stsp FILE *f = NULL;
1715 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1716 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1717 6353ad76 2019-02-08 stsp size_t flen, blen;
1718 2c4740ad 2023-02-12 mark unsigned char staged_status;
1720 2c4740ad 2023-02-12 mark staged_status = get_staged_status(ie);
1721 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1722 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1725 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1726 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1727 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1729 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1730 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1731 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1732 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1733 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1735 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1736 882ef1b9 2019-12-13 stsp goto done;
1738 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1739 3d35a492 2019-12-13 stsp goto done;
1742 8bd0cdad 2021-12-31 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1743 5c02d2a5 2021-09-26 stsp if (fd == -1 && errno != ENOENT &&
1744 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
1745 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1746 5c02d2a5 2021-09-26 stsp else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1747 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1748 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1749 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1750 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1751 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1752 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1754 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1755 3d35a492 2019-12-13 stsp goto done;
1757 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1758 1338848f 2019-12-13 stsp goto done;
1762 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1763 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1764 1338848f 2019-12-13 stsp goto done;
1767 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1768 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1769 1338848f 2019-12-13 stsp goto done;
1770 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1771 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1772 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1773 1338848f 2019-12-13 stsp goto done;
1776 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1777 f179e66d 2020-07-23 stsp goto done;
1779 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1780 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1781 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1782 1338848f 2019-12-13 stsp goto done;
1785 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1786 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1787 b4b2adf5 2023-02-09 op got_fileindex_entry_get_staged_blob_id(&id, ie);
1789 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&id, ie);
1791 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1792 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1793 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1794 eb81bc23 2022-06-28 tracey goto done;
1796 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1798 1338848f 2019-12-13 stsp goto done;
1800 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1801 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1802 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1803 a919d5c4 2020-07-23 stsp goto done;
1806 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1807 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1808 ab0d4361 2019-12-13 stsp if (fd == -1) {
1809 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1810 ab0d4361 2019-12-13 stsp goto done;
1814 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1815 6353ad76 2019-02-08 stsp if (f == NULL) {
1816 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1817 6353ad76 2019-02-08 stsp goto done;
1820 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1822 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1823 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1825 7154f6ce 2019-03-27 stsp goto done;
1826 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1827 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1828 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1829 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1830 7154f6ce 2019-03-27 stsp goto done;
1832 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1833 6353ad76 2019-02-08 stsp if (flen != 0)
1834 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1836 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1837 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1838 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1840 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1841 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1842 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1843 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1847 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1850 6353ad76 2019-02-08 stsp hdrlen = 0;
1853 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1854 7154f6ce 2019-03-27 stsp rewind(f);
1855 12383673 2023-02-18 mark err = get_modified_file_content_status(status, blob, ie->path,
1857 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1858 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1860 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1861 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
1863 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1864 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1865 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1866 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1867 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1868 9d31a1d8 2018-03-11 stsp return err;
1872 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1873 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1875 e2b1e152 2019-07-13 stsp static const struct got_error *
1876 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1877 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1879 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1880 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1881 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1883 e2b1e152 2019-07-13 stsp return NULL;
1886 9d31a1d8 2018-03-11 stsp static const struct got_error *
1887 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1888 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1889 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1890 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1891 0584f854 2019-04-06 stsp void *progress_arg)
1893 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1894 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1895 eb81bc23 2022-06-28 tracey char *ondisk_path = NULL;
1896 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1897 b8f41171 2019-02-10 stsp struct stat sb;
1898 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
1900 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1901 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1904 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1905 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1906 a76c42e6 2019-08-03 stsp goto done;
1908 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1911 abb4604f 2019-07-27 stsp goto done;
1912 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1913 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1915 f6764181 2021-09-24 stsp if (stat(ondisk_path, &sb) == -1) {
1916 f6764181 2021-09-24 stsp if (errno != ENOENT) {
1917 f6764181 2021-09-24 stsp err = got_error_from_errno2("stat",
1918 f6764181 2021-09-24 stsp ondisk_path);
1919 f6764181 2021-09-24 stsp goto done;
1921 f6764181 2021-09-24 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1922 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1924 f6764181 2021-09-24 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1925 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1927 f6764181 2021-09-24 stsp status = GOT_STATUS_OBSTRUCTED;
1931 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1933 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1934 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1935 b8f41171 2019-02-10 stsp goto done;
1937 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1939 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1940 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1942 5036ab18 2020-04-18 stsp goto done;
1945 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1946 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1947 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1949 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1950 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1951 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1952 c6e8a826 2021-04-05 stsp * updating contents of this file.
1954 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1955 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1956 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1957 c6e8a826 2021-04-05 stsp /* Same commit. */
1958 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1959 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1961 e2b1e152 2019-07-13 stsp goto done;
1962 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1964 6353ad76 2019-02-08 stsp goto done;
1966 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1967 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1968 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1969 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1970 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1971 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1973 0f58026f 2021-04-05 stsp goto done;
1974 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1976 b8f41171 2019-02-10 stsp goto done;
1980 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1981 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1982 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1983 eb81bc23 2022-06-28 tracey goto done;
1985 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1987 6353ad76 2019-02-08 stsp goto done;
1989 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1990 234035bc 2019-06-01 stsp int update_timestamps;
1991 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1992 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1993 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1994 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
1995 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
1996 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1997 eb81bc23 2022-06-28 tracey goto done;
1999 234035bc 2019-06-01 stsp struct got_object_id id2;
2000 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&id2, ie);
2001 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
2004 f69721c3 2019-10-21 stsp goto done;
2006 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
2007 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
2008 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
2009 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
2010 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
2011 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
2012 f69721c3 2019-10-21 stsp goto done;
2014 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2015 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2016 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2017 234035bc 2019-06-01 stsp goto done;
2020 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
2021 36bf999c 2020-07-23 stsp char *link_target;
2022 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
2024 36bf999c 2020-07-23 stsp goto done;
2025 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
2026 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
2027 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
2028 36bf999c 2020-07-23 stsp free(link_target);
2030 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
2031 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
2032 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
2033 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
2035 f69721c3 2019-10-21 stsp free(label_orig);
2036 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
2037 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
2038 eb81bc23 2022-06-28 tracey goto done;
2040 234035bc 2019-06-01 stsp if (blob2)
2041 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
2043 909d120e 2019-09-22 stsp goto done;
2045 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
2046 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
2047 234035bc 2019-06-01 stsp * unmodified files again.
2049 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2050 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
2051 234035bc 2019-06-01 stsp update_timestamps);
2052 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
2053 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2054 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2055 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
2056 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2058 1ee397ad 2019-07-12 stsp goto done;
2059 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2060 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2062 13d9040b 2019-03-27 stsp goto done;
2064 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2065 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
2066 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
2067 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2068 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2069 5267b9e4 2021-09-26 stsp status == GOT_STATUS_UNVERSIONED, 0,
2070 5267b9e4 2021-09-26 stsp repo, progress_cb, progress_arg);
2072 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2073 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2074 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2075 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2076 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2079 13d9040b 2019-03-27 stsp goto done;
2082 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2083 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2084 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2086 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2087 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2088 054041d0 2020-06-24 stsp &blob->id);
2091 13d9040b 2019-03-27 stsp goto done;
2093 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2094 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2095 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2099 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2100 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
2101 eb81bc23 2022-06-28 tracey goto done;
2103 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2105 6353ad76 2019-02-08 stsp free(ondisk_path);
2106 8da9e5f4 2019-01-12 stsp return err;
2109 90285c3b 2019-01-08 stsp static const struct got_error *
2110 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2112 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2113 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2115 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2116 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2118 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2119 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2120 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2122 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2123 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2125 1c4cdd89 2021-06-20 stsp goto done;
2126 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2127 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2128 fddefe3b 2020-10-20 stsp free(ondisk_path);
2129 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2130 1c4cdd89 2021-06-20 stsp parent = NULL;
2131 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2132 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2133 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2134 fddefe3b 2020-10-20 stsp ondisk_path);
2137 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2143 90285c3b 2019-01-08 stsp free(ondisk_path);
2144 1c4cdd89 2021-06-20 stsp free(parent);
2145 90285c3b 2019-01-08 stsp return err;
2148 708d8e67 2019-03-27 stsp static const struct got_error *
2149 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2150 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2151 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2153 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2154 708d8e67 2019-03-27 stsp unsigned char status;
2155 708d8e67 2019-03-27 stsp struct stat sb;
2156 708d8e67 2019-03-27 stsp char *ondisk_path;
2158 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2159 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2161 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2163 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2165 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2167 5a58a424 2020-06-23 stsp goto done;
2169 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2170 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2171 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2172 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2173 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2174 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2175 993e2a1b 2020-07-23 stsp goto done;
2177 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2178 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2179 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2180 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2182 993e2a1b 2020-07-23 stsp goto done;
2183 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2184 993e2a1b 2020-07-23 stsp ie->path);
2185 993e2a1b 2020-07-23 stsp goto done;
2188 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2189 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2190 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2192 5a58a424 2020-06-23 stsp goto done;
2194 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2195 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2197 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2198 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2200 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2202 5a58a424 2020-06-23 stsp goto done;
2203 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2204 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2206 5a58a424 2020-06-23 stsp goto done;
2208 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2211 5a58a424 2020-06-23 stsp free(ondisk_path);
2212 fc6346c4 2019-03-27 stsp return err;
2215 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2216 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2217 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2218 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2219 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2220 8da9e5f4 2019-01-12 stsp void *progress_arg;
2221 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2222 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2225 512f0d0e 2019-01-02 stsp static const struct got_error *
2226 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2227 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2229 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2231 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2232 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2234 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2235 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2238 8da9e5f4 2019-01-12 stsp static const struct got_error *
2239 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2241 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2243 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2244 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2246 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2247 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2250 9d31a1d8 2018-03-11 stsp static const struct got_error *
2251 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2253 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2254 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2255 8da9e5f4 2019-01-12 stsp char *path;
2257 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2258 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2260 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2261 63c5ca5d 2019-08-24 stsp return NULL;
2263 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2264 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2266 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2268 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2269 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2271 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2272 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2274 8da9e5f4 2019-01-12 stsp free(path);
2275 0cd1c46a 2019-03-11 stsp return err;
2278 b2118c49 2020-07-28 stsp const struct got_error *
2279 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2281 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2283 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2284 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2285 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2286 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2289 b2118c49 2020-07-28 stsp return NULL;
2292 818c7501 2019-07-11 stsp static const struct got_error *
2293 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2295 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2296 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2298 517bab73 2019-03-11 stsp *refname = NULL;
2300 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2302 b2118c49 2020-07-28 stsp return err;
2304 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2305 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2306 0647c563 2019-03-11 stsp *refname = NULL;
2308 517bab73 2019-03-11 stsp free(uuidstr);
2309 517bab73 2019-03-11 stsp return err;
2312 818c7501 2019-07-11 stsp const struct got_error *
2313 9587e6cc 2023-01-28 mark got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2314 9587e6cc 2023-01-28 mark const char *prefix)
2316 9587e6cc 2023-01-28 mark return get_ref_name(refname, worktree, prefix);
2319 9587e6cc 2023-01-28 mark const struct got_error *
2320 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2322 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2325 818c7501 2019-07-11 stsp static const struct got_error *
2326 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2328 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2329 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2332 818c7501 2019-07-11 stsp static const struct got_error *
2333 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2335 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2338 818c7501 2019-07-11 stsp static const struct got_error *
2339 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2341 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2342 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2345 818c7501 2019-07-11 stsp static const struct got_error *
2346 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2348 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2349 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2352 0ebf8283 2019-07-24 stsp static const struct got_error *
2353 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2355 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2356 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2359 0ebf8283 2019-07-24 stsp static const struct got_error *
2360 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2362 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2363 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2366 0ebf8283 2019-07-24 stsp static const struct got_error *
2367 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2369 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2370 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2373 0ebf8283 2019-07-24 stsp static const struct got_error *
2374 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2376 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2377 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2380 0ebf8283 2019-07-24 stsp const struct got_error *
2381 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2382 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2384 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2385 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2386 0ebf8283 2019-07-24 stsp *path = NULL;
2387 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2389 0ebf8283 2019-07-24 stsp return NULL;
2392 f259c4c1 2021-09-24 stsp static const struct got_error *
2393 f259c4c1 2021-09-24 stsp get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2395 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2396 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2399 f259c4c1 2021-09-24 stsp static const struct got_error *
2400 f259c4c1 2021-09-24 stsp get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2402 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2403 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2407 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2408 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2410 517bab73 2019-03-11 stsp static const struct got_error *
2411 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2413 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2414 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2415 517bab73 2019-03-11 stsp char *refname;
2417 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2419 517bab73 2019-03-11 stsp return err;
2421 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2423 0cd1c46a 2019-03-11 stsp goto done;
2425 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2427 0cd1c46a 2019-03-11 stsp free(refname);
2429 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2430 3e3a69f1 2019-07-25 stsp return err;
2433 3e3a69f1 2019-07-25 stsp static const struct got_error *
2434 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2436 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2438 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2439 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2440 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2441 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2443 9d31a1d8 2018-03-11 stsp return err;
2447 ebf99748 2019-05-09 stsp static const struct got_error *
2448 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2449 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2451 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2452 ebf99748 2019-05-09 stsp FILE *index = NULL;
2454 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2455 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2456 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2457 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2459 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2461 ebf99748 2019-05-09 stsp goto done;
2463 00fe21f2 2021-12-31 stsp index = fopen(*fileindex_path, "rbe");
2464 ebf99748 2019-05-09 stsp if (index == NULL) {
2465 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2466 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2468 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2469 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2470 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2473 ebf99748 2019-05-09 stsp if (err) {
2474 ebf99748 2019-05-09 stsp free(*fileindex_path);
2475 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2476 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2477 ebf99748 2019-05-09 stsp *fileindex = NULL;
2479 ebf99748 2019-05-09 stsp return err;
2482 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2483 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2484 c932eeeb 2019-05-22 stsp const char *path;
2485 c932eeeb 2019-05-22 stsp size_t path_len;
2486 c932eeeb 2019-05-22 stsp const char *entry_name;
2487 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2488 a484d721 2019-06-10 stsp void *progress_arg;
2491 c932eeeb 2019-05-22 stsp static const struct got_error *
2492 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2494 1ee397ad 2019-07-12 stsp const struct got_error *err;
2495 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2497 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2498 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2499 c932eeeb 2019-05-22 stsp return NULL;
2500 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2501 102ff934 2019-06-11 stsp return NULL;
2503 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2504 a769b60b 2021-06-27 stsp return NULL;
2506 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2507 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2508 c932eeeb 2019-05-22 stsp return NULL;
2510 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2511 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2512 edd02c5e 2019-07-11 stsp ie->path);
2514 1ee397ad 2019-07-12 stsp return err;
2516 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2517 c932eeeb 2019-05-22 stsp return NULL;
2520 b0a0c9ed 2023-02-06 op /* Bump base commit ID of all files within an updated part of the work tree. */
2521 a615e0e7 2020-12-16 stsp static const struct got_error *
2522 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2523 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2524 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2526 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2528 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2529 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2530 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2531 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2532 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2533 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2535 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2536 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2539 9c6338c4 2019-06-02 stsp static const struct got_error *
2540 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2542 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2543 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2544 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2545 867630bb 2020-01-17 stsp struct timespec timeout;
2547 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2548 b90054ed 2022-11-01 stsp fileindex_path, "");
2550 9c6338c4 2019-06-02 stsp goto done;
2552 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2554 9c6338c4 2019-06-02 stsp goto done;
2556 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2557 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2558 9c6338c4 2019-06-02 stsp fileindex_path);
2559 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2563 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2564 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2565 867630bb 2020-01-17 stsp * was recorded in the file index.
2567 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2568 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2569 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2571 9c6338c4 2019-06-02 stsp if (new_index)
2572 9c6338c4 2019-06-02 stsp fclose(new_index);
2573 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2574 9c6338c4 2019-06-02 stsp return err;
2577 6ced4176 2019-07-12 stsp static const struct got_error *
2578 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2579 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2580 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit, struct got_worktree *worktree,
2581 a44927cc 2022-04-07 stsp struct got_repository *repo)
2583 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2584 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2585 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2586 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2588 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2589 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2590 6ced4176 2019-07-12 stsp *tree_id = NULL;
2592 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2593 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2594 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2595 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2596 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2597 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2598 6ced4176 2019-07-12 stsp goto done;
2600 a44927cc 2022-04-07 stsp err = got_object_id_by_path(tree_id, repo, base_commit,
2601 a44927cc 2022-04-07 stsp worktree->path_prefix);
2603 6ced4176 2019-07-12 stsp goto done;
2604 6ced4176 2019-07-12 stsp return NULL;
2607 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2609 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2610 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2611 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2612 6ced4176 2019-07-12 stsp goto done;
2615 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2617 6ced4176 2019-07-12 stsp goto done;
2619 6ced4176 2019-07-12 stsp free(in_repo_path);
2620 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2622 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2624 6ced4176 2019-07-12 stsp goto done;
2626 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2627 6ced4176 2019-07-12 stsp /* Check out a single file. */
2628 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2629 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2630 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2631 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2632 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2633 6ced4176 2019-07-12 stsp goto done;
2635 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2636 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2637 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2638 6ced4176 2019-07-12 stsp goto done;
2641 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2642 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2644 6ced4176 2019-07-12 stsp return err;
2645 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2646 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2647 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2648 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2649 6ced4176 2019-07-12 stsp goto done;
2652 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2653 a44927cc 2022-04-07 stsp base_commit, in_repo_path);
2655 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2656 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2657 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2658 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2659 6ced4176 2019-07-12 stsp goto done;
2661 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2662 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2663 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2664 6ced4176 2019-07-12 stsp goto done;
2669 6ced4176 2019-07-12 stsp free(in_repo_path);
2670 6ced4176 2019-07-12 stsp if (err) {
2671 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2672 6ced4176 2019-07-12 stsp free(*tree_relpath);
2673 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2674 6ced4176 2019-07-12 stsp free(*tree_id);
2675 6ced4176 2019-07-12 stsp *tree_id = NULL;
2677 07ed472d 2019-07-12 stsp return err;
2680 07ed472d 2019-07-12 stsp static const struct got_error *
2681 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2682 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2683 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2684 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2686 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2687 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2688 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2689 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2690 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2692 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2693 7f47418f 2019-12-20 stsp if (err) {
2694 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2695 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2696 7f47418f 2019-12-20 stsp goto done;
2697 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2698 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2700 7f47418f 2019-12-20 stsp return err;
2703 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2704 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2706 07ed472d 2019-07-12 stsp goto done;
2708 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2710 07ed472d 2019-07-12 stsp goto done;
2712 07ed472d 2019-07-12 stsp if (entry_name &&
2713 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2714 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2715 07ed472d 2019-07-12 stsp goto done;
2718 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2719 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2720 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2721 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2722 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2723 07ed472d 2019-07-12 stsp arg.repo = repo;
2724 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2725 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2726 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2727 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2728 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2729 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2732 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2733 07ed472d 2019-07-12 stsp if (commit)
2734 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2735 6ced4176 2019-07-12 stsp return err;
2738 9d31a1d8 2018-03-11 stsp const struct got_error *
2739 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2740 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2741 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2742 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2744 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2745 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2746 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2747 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2748 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2749 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2750 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2751 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2752 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2753 f2ea84fa 2019-07-27 stsp int entry_type;
2754 f2ea84fa 2019-07-27 stsp char *relpath;
2755 f2ea84fa 2019-07-27 stsp char *entry_name;
2756 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2757 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2759 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2761 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2763 9d31a1d8 2018-03-11 stsp return err;
2765 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
2766 a44927cc 2022-04-07 stsp worktree->base_commit_id);
2768 a44927cc 2022-04-07 stsp goto done;
2770 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2771 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2772 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2773 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2774 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2775 f2ea84fa 2019-07-27 stsp goto done;
2778 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2779 a44927cc 2022-04-07 stsp &tpd->relpath, &tpd->tree_id, pe->path, commit,
2780 a44927cc 2022-04-07 stsp worktree, repo);
2781 f2ea84fa 2019-07-27 stsp if (err) {
2782 f2ea84fa 2019-07-27 stsp free(tpd);
2783 6ced4176 2019-07-12 stsp goto done;
2786 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2787 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2788 f2ea84fa 2019-07-27 stsp if (err) {
2789 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2790 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2791 f2ea84fa 2019-07-27 stsp free(tpd);
2792 f2ea84fa 2019-07-27 stsp goto done;
2795 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2797 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2801 51514078 2018-12-25 stsp * Read the file index.
2802 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2803 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2805 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2807 c4cdcb68 2019-04-03 stsp goto done;
2809 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2810 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2811 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2813 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2814 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2815 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2819 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2820 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2821 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2822 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2823 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2824 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2825 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2826 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2830 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2832 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2833 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2834 af12c6b9 2019-06-04 stsp err = sync_err;
2836 9c6338c4 2019-06-02 stsp free(fileindex_path);
2838 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2839 9d31a1d8 2018-03-11 stsp if (commit)
2840 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2841 5ade8233 2019-07-12 stsp if (fileindex)
2842 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2843 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2844 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2845 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2846 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2847 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2848 f2ea84fa 2019-07-27 stsp free(tpd);
2850 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2851 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2852 9d31a1d8 2018-03-11 stsp err = unlockerr;
2853 f8d1f275 2019-02-04 stsp return err;
2856 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2857 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2858 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2859 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2860 234035bc 2019-06-01 stsp void *progress_arg;
2861 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2862 234035bc 2019-06-01 stsp void *cancel_arg;
2863 f69721c3 2019-10-21 stsp const char *label_orig;
2864 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2865 5267b9e4 2021-09-26 stsp int allow_bad_symlinks;
2868 234035bc 2019-06-01 stsp static const struct got_error *
2869 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2870 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
2871 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
2872 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
2873 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2875 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2876 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2877 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2878 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2879 234035bc 2019-06-01 stsp struct stat sb;
2880 234035bc 2019-06-01 stsp unsigned char status;
2881 234035bc 2019-06-01 stsp int local_changes_subsumed;
2882 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2883 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2885 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2886 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2887 d6c87207 2019-08-02 stsp strlen(path2));
2888 1ee397ad 2019-07-12 stsp if (ie == NULL)
2889 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2890 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2892 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2893 234035bc 2019-06-01 stsp path2) == -1)
2894 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2896 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2899 234035bc 2019-06-01 stsp goto done;
2901 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2902 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2903 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2904 234035bc 2019-06-01 stsp goto done;
2906 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2907 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2908 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2909 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2910 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2911 234035bc 2019-06-01 stsp goto done;
2914 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2915 36bf999c 2020-07-23 stsp char *link_target2;
2916 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2918 36bf999c 2020-07-23 stsp goto done;
2919 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2920 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2921 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2922 36bf999c 2020-07-23 stsp free(link_target2);
2926 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2927 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2928 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2929 1af628f4 2021-06-03 stsp goto done;
2931 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2932 1af628f4 2021-06-03 stsp f_orig, blob1);
2934 1af628f4 2021-06-03 stsp goto done;
2936 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2937 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2938 1af628f4 2021-06-03 stsp goto done;
2939 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2940 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2942 1af628f4 2021-06-03 stsp goto done;
2944 c0df5966 2021-12-31 stsp fd = open(ondisk_path,
2945 c0df5966 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2946 1af628f4 2021-06-03 stsp if (fd == -1) {
2947 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2948 1af628f4 2021-06-03 stsp ondisk_path);
2949 1af628f4 2021-06-03 stsp goto done;
2951 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2952 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2953 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2954 1af628f4 2021-06-03 stsp ondisk_path);
2955 1af628f4 2021-06-03 stsp close(fd);
2956 1af628f4 2021-06-03 stsp goto done;
2958 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2960 1af628f4 2021-06-03 stsp goto done;
2961 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2962 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2963 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2964 1af628f4 2021-06-03 stsp goto done;
2966 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2967 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2968 c48f94a4 2023-01-29 stsp mode2, a->label_orig, NULL, label_deriv2,
2969 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2970 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2972 234035bc 2019-06-01 stsp } else if (blob1) {
2973 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2974 d6c87207 2019-08-02 stsp strlen(path1));
2975 1ee397ad 2019-07-12 stsp if (ie == NULL)
2976 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2977 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2979 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2980 2b92fad7 2019-06-02 stsp path1) == -1)
2981 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2983 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2986 2b92fad7 2019-06-02 stsp goto done;
2988 2b92fad7 2019-06-02 stsp switch (status) {
2989 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2990 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2991 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2993 1ee397ad 2019-07-12 stsp goto done;
2994 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2996 2b92fad7 2019-06-02 stsp goto done;
2998 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3000 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
3001 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
3002 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3003 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
3005 1ee397ad 2019-07-12 stsp goto done;
3007 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3009 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
3010 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
3011 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
3012 72840534 2022-01-19 stsp off_t blob1_size;
3014 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
3015 0a22ca1a 2020-09-23 stsp * exists in the repository.
3017 72840534 2022-01-19 stsp err = got_object_blob_file_create(&id, &blob1_f,
3018 72840534 2022-01-19 stsp &blob1_size, path1);
3020 0a22ca1a 2020-09-23 stsp goto done;
3021 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
3022 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3023 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
3025 0a22ca1a 2020-09-23 stsp goto done;
3026 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
3029 0a22ca1a 2020-09-23 stsp goto done;
3031 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
3034 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3035 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
3037 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
3038 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
3041 0a22ca1a 2020-09-23 stsp goto done;
3044 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
3045 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
3046 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3047 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
3049 1ee397ad 2019-07-12 stsp goto done;
3051 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
3052 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
3054 1ee397ad 2019-07-12 stsp goto done;
3059 234035bc 2019-06-01 stsp } else if (blob2) {
3060 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3061 234035bc 2019-06-01 stsp path2) == -1)
3062 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3063 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
3064 d6c87207 2019-08-02 stsp strlen(path2));
3066 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
3067 7f91a133 2019-12-13 stsp -1, NULL, repo);
3069 234035bc 2019-06-01 stsp goto done;
3070 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3071 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3072 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3073 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3074 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3075 1ee397ad 2019-07-12 stsp status, path2);
3076 234035bc 2019-06-01 stsp goto done;
3078 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3079 36bf999c 2020-07-23 stsp char *link_target2;
3080 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3083 36bf999c 2020-07-23 stsp goto done;
3084 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3085 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3086 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3087 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3088 36bf999c 2020-07-23 stsp free(link_target2);
3089 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3090 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3091 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3092 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3093 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3094 526a746f 2020-07-23 stsp a->progress_arg);
3096 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3097 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3100 dfe9fba0 2020-07-23 stsp goto done;
3101 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3102 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3103 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3104 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3106 234035bc 2019-06-01 stsp goto done;
3109 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3110 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3111 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3112 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3113 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3114 5267b9e4 2021-09-26 stsp 0, 1, a->allow_bad_symlinks, repo,
3115 5267b9e4 2021-09-26 stsp a->progress_cb, a->progress_arg);
3117 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3118 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3119 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3122 234035bc 2019-06-01 stsp goto done;
3123 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3125 234035bc 2019-06-01 stsp goto done;
3126 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3127 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3128 3969253a 2020-03-07 stsp if (err) {
3129 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3130 3969253a 2020-03-07 stsp goto done;
3132 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3133 2b92fad7 2019-06-02 stsp if (err) {
3134 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3135 2b92fad7 2019-06-02 stsp goto done;
3137 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3138 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3139 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3144 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3145 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3146 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3147 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3148 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3149 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3150 1af628f4 2021-06-03 stsp free(id_str);
3151 54d5be07 2021-06-03 stsp free(label_deriv2);
3152 234035bc 2019-06-01 stsp free(ondisk_path);
3153 234035bc 2019-06-01 stsp return err;
3156 69de9dd4 2021-09-03 stsp static const struct got_error *
3157 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3159 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3161 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3162 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3163 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3164 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3165 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3167 69de9dd4 2021-09-03 stsp return NULL;
3170 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3171 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3172 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3173 234035bc 2019-06-01 stsp struct got_repository *repo;
3176 234035bc 2019-06-01 stsp static const struct got_error *
3177 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3178 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
3179 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
3180 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
3181 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3183 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3184 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3185 234035bc 2019-06-01 stsp unsigned char status;
3186 234035bc 2019-06-01 stsp struct stat sb;
3187 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3188 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3189 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3190 234035bc 2019-06-01 stsp char *ondisk_path;
3192 69de9dd4 2021-09-03 stsp if (id == NULL)
3193 69de9dd4 2021-09-03 stsp return NULL;
3195 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3196 69de9dd4 2021-09-03 stsp if (ie == NULL)
3197 69de9dd4 2021-09-03 stsp return NULL;
3199 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3201 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3203 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3204 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3205 5546d466 2021-09-02 stsp free(ondisk_path);
3207 234035bc 2019-06-01 stsp return err;
3208 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3209 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3211 234035bc 2019-06-01 stsp return NULL;
3214 818c7501 2019-07-11 stsp static const struct got_error *
3215 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3216 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3217 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3218 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3219 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3221 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3222 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3223 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3224 a44927cc 2022-04-07 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3225 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3226 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3227 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3228 b72706c3 2022-06-01 stsp FILE *f1 = NULL, *f2 = NULL;
3229 f9d37699 2022-06-28 stsp int fd1 = -1, fd2 = -1;
3231 03415a1a 2019-06-02 stsp if (commit_id1) {
3232 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit1, repo, commit_id1);
3234 a44927cc 2022-04-07 stsp goto done;
3235 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id1, repo, commit1,
3236 03415a1a 2019-06-02 stsp worktree->path_prefix);
3237 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3238 03415a1a 2019-06-02 stsp goto done;
3240 69d57f3d 2020-07-31 stsp if (tree_id1) {
3241 69d57f3d 2020-07-31 stsp char *id_str;
3243 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3245 03415a1a 2019-06-02 stsp goto done;
3247 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3249 f69721c3 2019-10-21 stsp goto done;
3251 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3252 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3253 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3254 f69721c3 2019-10-21 stsp free(id_str);
3255 f69721c3 2019-10-21 stsp goto done;
3257 f69721c3 2019-10-21 stsp free(id_str);
3259 b72706c3 2022-06-01 stsp f1 = got_opentemp();
3260 b72706c3 2022-06-01 stsp if (f1 == NULL) {
3261 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3262 b72706c3 2022-06-01 stsp goto done;
3266 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit2, repo, commit_id2);
3268 a44927cc 2022-04-07 stsp goto done;
3270 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id2, repo, commit2,
3271 234035bc 2019-06-01 stsp worktree->path_prefix);
3273 234035bc 2019-06-01 stsp goto done;
3275 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3277 234035bc 2019-06-01 stsp goto done;
3279 b72706c3 2022-06-01 stsp f2 = got_opentemp();
3280 b72706c3 2022-06-01 stsp if (f2 == NULL) {
3281 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3282 f9d37699 2022-06-28 stsp goto done;
3285 f9d37699 2022-06-28 stsp fd1 = got_opentempfd();
3286 f9d37699 2022-06-28 stsp if (fd1 == -1) {
3287 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3288 b72706c3 2022-06-01 stsp goto done;
3291 f9d37699 2022-06-28 stsp fd2 = got_opentempfd();
3292 f9d37699 2022-06-28 stsp if (fd2 == -1) {
3293 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3294 f9d37699 2022-06-28 stsp goto done;
3297 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3298 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3299 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3300 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3301 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3303 69de9dd4 2021-09-03 stsp goto done;
3305 234035bc 2019-06-01 stsp arg.worktree = worktree;
3306 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3307 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3308 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3309 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3310 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3311 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3312 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3313 5267b9e4 2021-09-26 stsp arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3314 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3315 b72706c3 2022-06-01 stsp merge_file_cb, &arg, 1);
3316 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3317 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3318 af12c6b9 2019-06-04 stsp err = sync_err;
3320 a44927cc 2022-04-07 stsp if (commit1)
3321 a44927cc 2022-04-07 stsp got_object_commit_close(commit1);
3322 a44927cc 2022-04-07 stsp if (commit2)
3323 a44927cc 2022-04-07 stsp got_object_commit_close(commit2);
3324 234035bc 2019-06-01 stsp if (tree1)
3325 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3326 234035bc 2019-06-01 stsp if (tree2)
3327 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3328 b72706c3 2022-06-01 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3329 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3330 b72706c3 2022-06-01 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3331 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3332 f9d37699 2022-06-28 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3333 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3334 f9d37699 2022-06-28 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3335 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3336 f69721c3 2019-10-21 stsp free(label_orig);
3337 818c7501 2019-07-11 stsp return err;
3340 818c7501 2019-07-11 stsp const struct got_error *
3341 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3342 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3343 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3344 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3346 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3347 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3348 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3350 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3352 818c7501 2019-07-11 stsp return err;
3354 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3356 818c7501 2019-07-11 stsp goto done;
3358 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3359 69de9dd4 2021-09-03 stsp worktree);
3361 818c7501 2019-07-11 stsp goto done;
3363 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3364 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3365 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3367 818c7501 2019-07-11 stsp if (fileindex)
3368 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3369 818c7501 2019-07-11 stsp free(fileindex_path);
3370 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3371 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3372 234035bc 2019-06-01 stsp err = unlockerr;
3373 234035bc 2019-06-01 stsp return err;
3376 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3377 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3378 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3379 927df6b7 2019-02-10 stsp const char *status_path;
3380 927df6b7 2019-02-10 stsp size_t status_path_len;
3381 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3382 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3383 f8d1f275 2019-02-04 stsp void *status_arg;
3384 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3385 f8d1f275 2019-02-04 stsp void *cancel_arg;
3386 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3387 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3388 f2a9dc41 2019-12-13 tracey int report_unchanged;
3389 3143d852 2020-06-25 stsp int no_ignores;
3392 f8d1f275 2019-02-04 stsp static const struct got_error *
3393 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3394 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3395 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3396 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3398 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3399 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3400 2c4740ad 2023-02-12 mark unsigned char staged_status;
3401 927df6b7 2019-02-10 stsp struct stat sb;
3402 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3403 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3404 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3406 2c4740ad 2023-02-12 mark staged_status = get_staged_status(ie);
3407 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3409 98eaaa12 2019-08-03 stsp return err;
3411 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3412 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3413 98eaaa12 2019-08-03 stsp return NULL;
3415 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_blob(ie))
3416 b4b2adf5 2023-02-09 op blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
3417 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_commit(ie))
3418 b4b2adf5 2023-02-09 op commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
3419 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3420 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3421 b4b2adf5 2023-02-09 op staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
3422 b4b2adf5 2023-02-09 op &staged_blob_id, ie);
3425 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3426 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3429 927df6b7 2019-02-10 stsp static const struct got_error *
3430 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3431 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3433 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3434 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3435 f8d1f275 2019-02-04 stsp char *abspath;
3437 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3438 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3440 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3441 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3442 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3443 927df6b7 2019-02-10 stsp return NULL;
3445 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3446 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3447 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3448 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3450 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3451 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3452 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3455 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3456 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3457 f8d1f275 2019-02-04 stsp free(abspath);
3458 9d31a1d8 2018-03-11 stsp return err;
3461 f8d1f275 2019-02-04 stsp static const struct got_error *
3462 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3464 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3465 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3466 2ec1f75b 2019-03-26 stsp unsigned char status;
3468 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3469 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3471 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3472 927df6b7 2019-02-10 stsp return NULL;
3474 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&blob_id, ie);
3475 b4b2adf5 2023-02-09 op got_fileindex_entry_get_commit_id(&commit_id, ie);
3476 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3477 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3479 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3480 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3481 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3485 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3487 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3489 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3490 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3492 d8bacb93 2023-01-10 mark got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3494 d8bacb93 2023-01-10 mark got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3497 6841da00 2019-08-08 stsp static const struct got_error *
3498 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3500 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3501 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3502 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3503 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3504 6841da00 2019-08-08 stsp size_t linesize = 0;
3505 6841da00 2019-08-08 stsp ssize_t linelen;
3507 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3508 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3509 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3510 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3512 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3513 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3514 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3516 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3517 bd8de430 2019-10-04 stsp if (line[0] == '#')
3520 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3521 bd8de430 2019-10-04 stsp if (line[0] == '!')
3524 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3525 6841da00 2019-08-08 stsp line) == -1) {
3526 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3527 6841da00 2019-08-08 stsp goto done;
3529 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3531 6841da00 2019-08-08 stsp goto done;
3533 6841da00 2019-08-08 stsp if (ferror(f)) {
3534 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3535 6841da00 2019-08-08 stsp goto done;
3538 6841da00 2019-08-08 stsp dirpath = strdup(path);
3539 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3540 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3541 6841da00 2019-08-08 stsp goto done;
3543 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3545 6841da00 2019-08-08 stsp free(line);
3546 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3547 6841da00 2019-08-08 stsp free(dirpath);
3548 d8bacb93 2023-01-10 mark got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3550 6841da00 2019-08-08 stsp return err;
3553 249b637c 2023-02-20 stsp static int
3554 249b637c 2023-02-20 stsp match_path(const char *pattern, size_t pattern_len, const char *path,
3555 249b637c 2023-02-20 stsp int flags)
3557 249b637c 2023-02-20 stsp char buf[PATH_MAX];
3560 249b637c 2023-02-20 stsp * Trailing slashes signify directories.
3561 249b637c 2023-02-20 stsp * Append a * to make such patterns conform to fnmatch rules.
3563 249b637c 2023-02-20 stsp if (pattern_len > 0 && pattern[pattern_len - 1] == '/') {
3564 249b637c 2023-02-20 stsp if (snprintf(buf, sizeof(buf), "%s*", pattern) >= sizeof(buf))
3565 249b637c 2023-02-20 stsp return FNM_NOMATCH; /* XXX */
3567 249b637c 2023-02-20 stsp return fnmatch(buf, path, flags);
3570 249b637c 2023-02-20 stsp return fnmatch(pattern, path, flags);
3574 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3576 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3578 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3579 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3580 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3581 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3583 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3584 249b637c 2023-02-20 stsp const char *p;
3586 249b637c 2023-02-20 stsp if (pi->path_len < 3 ||
3587 249b637c 2023-02-20 stsp strncmp(pi->path, "**/", 3) != 0)
3590 bd8de430 2019-10-04 stsp while (*p) {
3591 249b637c 2023-02-20 stsp if (match_path(pi->path + 3,
3592 249b637c 2023-02-20 stsp pi->path_len - 3, p,
3593 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3594 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3595 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3597 bd8de430 2019-10-04 stsp while (*p == '/')
3607 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3608 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3609 6841da00 2019-08-08 stsp * ignores backwards.
3611 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3612 6841da00 2019-08-08 stsp while (pe) {
3613 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3614 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3615 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3616 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3617 249b637c 2023-02-20 stsp int flags = FNM_LEADING_DIR;
3618 249b637c 2023-02-20 stsp if (strstr(pi->path, "/**/") == NULL)
3619 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3620 249b637c 2023-02-20 stsp if (match_path(pi->path, pi->path_len,
3621 249b637c 2023-02-20 stsp path, flags))
3626 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3632 6841da00 2019-08-08 stsp static const struct got_error *
3633 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3634 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3636 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3637 6841da00 2019-08-08 stsp char *ignorespath;
3638 886cec17 2019-12-15 stsp int fd = -1;
3639 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3641 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3642 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3643 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3645 886cec17 2019-12-15 stsp if (dirfd != -1) {
3646 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, ignores_filename,
3647 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3648 886cec17 2019-12-15 stsp if (fd == -1) {
3649 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3650 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3651 886cec17 2019-12-15 stsp ignorespath);
3653 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3654 5e91dae4 2022-08-30 stsp if (ignoresfile == NULL)
3655 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3656 886cec17 2019-12-15 stsp ignorespath);
3659 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3663 00fe21f2 2021-12-31 stsp ignoresfile = fopen(ignorespath, "re");
3664 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3665 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3666 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3667 886cec17 2019-12-15 stsp ignorespath);
3669 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3672 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3673 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3674 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3675 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3676 6841da00 2019-08-08 stsp free(ignorespath);
3677 6841da00 2019-08-08 stsp return err;
3680 f8d1f275 2019-02-04 stsp static const struct got_error *
3681 62da3196 2021-10-01 stsp status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3682 62da3196 2021-10-01 stsp int dirfd)
3684 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3685 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3686 f8d1f275 2019-02-04 stsp char *path = NULL;
3688 62da3196 2021-10-01 stsp if (ignore != NULL)
3689 62da3196 2021-10-01 stsp *ignore = 0;
3691 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3692 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3694 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3695 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3696 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3698 f8d1f275 2019-02-04 stsp path = de->d_name;
3701 62da3196 2021-10-01 stsp if (de->d_type == DT_DIR) {
3702 62da3196 2021-10-01 stsp if (!a->no_ignores && ignore != NULL &&
3703 62da3196 2021-10-01 stsp match_ignores(a->ignores, path))
3704 62da3196 2021-10-01 stsp *ignore = 1;
3705 62da3196 2021-10-01 stsp } else if (!match_ignores(a->ignores, path) &&
3706 62da3196 2021-10-01 stsp got_path_is_child(path, a->status_path, a->status_path_len))
3707 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3708 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3709 f8d1f275 2019-02-04 stsp if (parent_path[0])
3710 f8d1f275 2019-02-04 stsp free(path);
3711 b72f483a 2019-02-05 stsp return err;
3714 347d1d3e 2019-07-12 stsp static const struct got_error *
3715 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3717 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3718 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3720 3143d852 2020-06-25 stsp if (a->no_ignores)
3721 3143d852 2020-06-25 stsp return NULL;
3723 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3724 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3726 3143d852 2020-06-25 stsp return err;
3728 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3729 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3731 3143d852 2020-06-25 stsp return err;
3734 3143d852 2020-06-25 stsp static const struct got_error *
3735 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3736 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3737 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3738 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3740 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3741 abb4604f 2019-07-27 stsp struct stat sb;
3743 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3745 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3746 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3748 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3749 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3750 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3751 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3752 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3755 916237f3 2022-02-11 stsp if (!no_ignores && match_ignores(ignores, path))
3756 916237f3 2022-02-11 stsp return NULL;
3758 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3759 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3760 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3762 abb4604f 2019-07-27 stsp return NULL;
3765 3143d852 2020-06-25 stsp static const struct got_error *
3766 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3767 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3769 3143d852 2020-06-25 stsp const struct got_error *err;
3770 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3772 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3773 3143d852 2020-06-25 stsp ".cvsignore");
3775 3143d852 2020-06-25 stsp return err;
3777 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3778 3143d852 2020-06-25 stsp ".gitignore");
3780 3143d852 2020-06-25 stsp return err;
3782 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3783 3143d852 2020-06-25 stsp if (err) {
3784 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3785 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3786 3143d852 2020-06-25 stsp return err;
3788 3143d852 2020-06-25 stsp for (;;) {
3789 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3790 3143d852 2020-06-25 stsp ".cvsignore");
3793 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3794 3143d852 2020-06-25 stsp ".gitignore");
3797 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3798 3143d852 2020-06-25 stsp if (err) {
3799 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3800 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3803 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3805 b737c85a 2020-06-26 stsp free(parent_path);
3806 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3807 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3810 b737c85a 2020-06-26 stsp free(parent_path);
3811 b737c85a 2020-06-26 stsp free(next_parent_path);
3812 3143d852 2020-06-25 stsp return err;
3815 abb4604f 2019-07-27 stsp static const struct got_error *
3816 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3817 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3818 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3819 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3820 f2a9dc41 2019-12-13 tracey int report_unchanged)
3822 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3823 6fc93f37 2019-12-13 stsp int fd = -1;
3824 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3825 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3826 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3827 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3828 a84c0d30 2022-03-12 stsp struct got_fileindex_entry *ie;
3830 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3832 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3833 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3834 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3836 a84c0d30 2022-03-12 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3838 a84c0d30 2022-03-12 stsp err = report_single_file_status(path, ondisk_path,
3839 a84c0d30 2022-03-12 stsp fileindex, status_cb, status_arg, repo,
3840 a84c0d30 2022-03-12 stsp report_unchanged, &ignores, no_ignores);
3841 a84c0d30 2022-03-12 stsp goto done;
3844 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3845 6fc93f37 2019-12-13 stsp if (fd == -1) {
3846 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3847 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
3848 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3850 ff56836b 2021-07-08 stsp if (!no_ignores) {
3851 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3852 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3854 ff56836b 2021-07-08 stsp goto done;
3856 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3857 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3858 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3861 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3862 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3863 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3864 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3865 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3866 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3867 abb4604f 2019-07-27 stsp arg.status_path = path;
3868 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3869 abb4604f 2019-07-27 stsp arg.repo = repo;
3870 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3871 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3872 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3873 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3874 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3875 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3876 022fae89 2019-12-06 tracey if (!no_ignores) {
3877 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3878 3143d852 2020-06-25 stsp worktree->root_path, path);
3880 3143d852 2020-06-25 stsp goto done;
3882 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3883 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3884 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3887 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3888 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3889 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3890 927df6b7 2019-02-10 stsp free(ondisk_path);
3891 347d1d3e 2019-07-12 stsp return err;
3894 347d1d3e 2019-07-12 stsp const struct got_error *
3895 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3896 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3897 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3898 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3900 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3901 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3902 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3903 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3905 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3907 347d1d3e 2019-07-12 stsp return err;
3909 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3910 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3911 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3912 f6343036 2021-06-22 stsp no_ignores, 0);
3916 f8d1f275 2019-02-04 stsp free(fileindex_path);
3917 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3918 f8d1f275 2019-02-04 stsp return err;
3921 6c7ab921 2019-03-18 stsp const struct got_error *
3922 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3923 6c7ab921 2019-03-18 stsp const char *arg)
3925 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3926 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3927 6c7ab921 2019-03-18 stsp size_t len;
3928 00bb5ea0 2020-07-23 stsp struct stat sb;
3929 01740607 2020-11-04 stsp char *abspath = NULL;
3930 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3932 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3934 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3935 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3936 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3938 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3939 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3940 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3941 00bb5ea0 2020-07-23 stsp goto done;
3943 727173c3 2020-11-06 stsp sb.st_mode = 0;
3945 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3947 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3948 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3949 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3950 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3952 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3953 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3954 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3955 00bb5ea0 2020-07-23 stsp goto done;
3959 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3960 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3962 d0710d08 2019-07-22 stsp goto done;
3963 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3964 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3965 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3966 00bb5ea0 2020-07-23 stsp goto done;
3969 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3970 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3971 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3972 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3973 00bb5ea0 2020-07-23 stsp goto done;
3975 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3976 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3977 01740607 2020-11-04 stsp goto done;
3979 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3980 01740607 2020-11-04 stsp sizeof(canonpath));
3982 00bb5ea0 2020-07-23 stsp goto done;
3983 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3984 01740607 2020-11-04 stsp if (resolved == NULL) {
3985 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3986 01740607 2020-11-04 stsp goto done;
3991 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3992 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3993 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3994 6c7ab921 2019-03-18 stsp goto done;
3997 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3998 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3999 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
4001 f6d88e1a 2019-05-29 stsp goto done;
4003 f6d88e1a 2019-05-29 stsp path = strdup("");
4004 f6d88e1a 2019-05-29 stsp if (path == NULL) {
4005 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
4006 f6d88e1a 2019-05-29 stsp goto done;
4010 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
4011 6c7ab921 2019-03-18 stsp len = strlen(path);
4012 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
4013 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
4017 01740607 2020-11-04 stsp free(abspath);
4018 6c7ab921 2019-03-18 stsp free(resolved);
4019 d0710d08 2019-07-22 stsp free(cwd);
4020 6c7ab921 2019-03-18 stsp if (err == NULL)
4021 6c7ab921 2019-03-18 stsp *wt_path = path;
4023 6c7ab921 2019-03-18 stsp free(path);
4024 d00136be 2019-03-26 stsp return err;
4027 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
4028 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
4029 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
4030 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
4031 4e68cba3 2019-11-23 stsp void *progress_arg;
4032 4e68cba3 2019-11-23 stsp struct got_repository *repo;
4035 4e68cba3 2019-11-23 stsp static const struct got_error *
4036 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
4037 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
4038 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4039 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4041 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
4042 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
4043 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
4044 6d022e97 2019-08-04 stsp struct stat sb;
4045 dbb83fbd 2019-12-12 stsp char *ondisk_path;
4047 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4048 dbb83fbd 2019-12-12 stsp relpath) == -1)
4049 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
4051 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4053 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
4054 12463d8b 2019-12-13 stsp de_name, a->repo);
4056 dbb83fbd 2019-12-12 stsp goto done;
4057 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
4058 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
4059 dbb83fbd 2019-12-12 stsp goto done;
4060 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4062 dbb83fbd 2019-12-12 stsp goto done;
4065 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
4066 9b4603c0 2022-01-31 stsp if (status == GOT_STATUS_NONEXISTENT)
4067 9b4603c0 2022-01-31 stsp err = got_error_set_errno(ENOENT, ondisk_path);
4069 9b4603c0 2022-01-31 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
4070 dbb83fbd 2019-12-12 stsp goto done;
4073 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
4075 4e68cba3 2019-11-23 stsp goto done;
4076 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
4077 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
4078 3969253a 2020-03-07 stsp if (err) {
4079 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4080 3969253a 2020-03-07 stsp goto done;
4082 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
4083 07f5b47a 2019-06-02 stsp if (err) {
4084 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
4085 4e68cba3 2019-11-23 stsp goto done;
4088 dbb83fbd 2019-12-12 stsp free(ondisk_path);
4090 dbb83fbd 2019-12-12 stsp return err;
4091 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
4092 dbb83fbd 2019-12-12 stsp return NULL;
4093 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4096 d00136be 2019-03-26 stsp const struct got_error *
4097 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4098 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4099 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4100 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4102 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4103 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4104 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4105 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4106 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4108 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4110 d00136be 2019-03-26 stsp return err;
4112 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4114 d00136be 2019-03-26 stsp goto done;
4116 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4117 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4118 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4119 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4120 4e68cba3 2019-11-23 stsp saa.repo = repo;
4122 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4123 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4124 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4128 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4129 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4130 af12c6b9 2019-06-04 stsp err = sync_err;
4132 fb399478 2019-07-12 stsp free(fileindex_path);
4133 d00136be 2019-03-26 stsp if (fileindex)
4134 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4135 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4136 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4137 d00136be 2019-03-26 stsp err = unlockerr;
4138 6c7ab921 2019-03-18 stsp return err;
4141 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4142 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4143 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4144 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4145 f2a9dc41 2019-12-13 tracey void *progress_arg;
4146 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4147 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4148 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4149 4e12cd97 2022-01-25 stsp int ignore_missing_paths;
4150 766841c2 2020-08-13 stsp const char *status_codes;
4153 f2a9dc41 2019-12-13 tracey static const struct got_error *
4154 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4155 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4156 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4157 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4159 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4160 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4161 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4162 17ed4618 2019-06-02 stsp struct stat sb;
4163 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4165 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_NONEXISTENT) {
4166 4e12cd97 2022-01-25 stsp if (a->ignore_missing_paths)
4167 4e12cd97 2022-01-25 stsp return NULL;
4168 4e12cd97 2022-01-25 stsp return got_error_set_errno(ENOENT, relpath);
4171 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4172 17ed4618 2019-06-02 stsp if (ie == NULL)
4173 692bdcc4 2022-01-25 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4175 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4176 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4177 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4178 9acbc4fa 2019-08-03 stsp return NULL;
4179 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4182 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4183 f2a9dc41 2019-12-13 tracey relpath) == -1)
4184 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4186 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4189 f2a9dc41 2019-12-13 tracey goto done;
4191 766841c2 2020-08-13 stsp if (a->status_codes) {
4192 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4194 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4195 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4198 5e91dae4 2022-08-30 stsp if (i == ncodes) {
4199 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4200 766841c2 2020-08-13 stsp free(ondisk_path);
4201 766841c2 2020-08-13 stsp return NULL;
4203 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4204 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4205 766841c2 2020-08-13 stsp static char msg[64];
4206 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4207 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4208 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4209 766841c2 2020-08-13 stsp goto done;
4213 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4214 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4215 f2a9dc41 2019-12-13 tracey goto done;
4216 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4217 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4218 f2a9dc41 2019-12-13 tracey goto done;
4220 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4221 4e12cd97 2022-01-25 stsp err = got_error_set_errno(ENOENT, relpath);
4222 4e12cd97 2022-01-25 stsp goto done;
4224 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4225 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4226 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4227 f2a9dc41 2019-12-13 tracey goto done;
4231 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4232 20a2ad1c 2020-10-20 stsp size_t root_len;
4234 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4235 a06ca3f7 2022-10-15 stsp if (unlinkat(dirfd, de_name, 0) == -1) {
4236 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4237 12463d8b 2019-12-13 stsp ondisk_path);
4238 12463d8b 2019-12-13 stsp goto done;
4240 a06ca3f7 2022-10-15 stsp } else if (unlink(ondisk_path) == -1) {
4241 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4242 12463d8b 2019-12-13 stsp goto done;
4245 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4247 20a2ad1c 2020-10-20 stsp char *parent;
4248 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4250 2513f20a 2020-10-20 stsp goto done;
4251 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4252 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4253 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4254 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4255 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4256 20a2ad1c 2020-10-20 stsp ondisk_path);
4259 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4260 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4263 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4265 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4266 f2a9dc41 2019-12-13 tracey if (err)
4267 f2a9dc41 2019-12-13 tracey return err;
4268 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4269 f2a9dc41 2019-12-13 tracey return NULL;
4270 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4271 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4274 2ec1f75b 2019-03-26 stsp const struct got_error *
4275 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4276 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4277 766841c2 2020-08-13 stsp const char *status_codes,
4278 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4279 4e12cd97 2022-01-25 stsp struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4281 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4282 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4283 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4284 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4285 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4287 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4289 2ec1f75b 2019-03-26 stsp return err;
4291 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4293 2ec1f75b 2019-03-26 stsp goto done;
4295 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4296 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4297 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4298 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4299 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4300 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4301 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4302 4e12cd97 2022-01-25 stsp sda.ignore_missing_paths = ignore_missing_paths;
4303 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4305 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4306 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4307 62da3196 2021-10-01 stsp schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4311 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4312 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4313 af12c6b9 2019-06-04 stsp err = sync_err;
4315 fb399478 2019-07-12 stsp free(fileindex_path);
4316 2ec1f75b 2019-03-26 stsp if (fileindex)
4317 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4318 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4319 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4320 2ec1f75b 2019-03-26 stsp err = unlockerr;
4321 33aa809d 2019-08-08 stsp return err;
4324 33aa809d 2019-08-08 stsp static const struct got_error *
4325 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4327 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4328 33aa809d 2019-08-08 stsp char *line = NULL;
4329 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4330 33aa809d 2019-08-08 stsp ssize_t linelen;
4332 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4333 33aa809d 2019-08-08 stsp if (linelen == -1) {
4334 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4335 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4336 33aa809d 2019-08-08 stsp goto done;
4338 33aa809d 2019-08-08 stsp return NULL;
4340 33aa809d 2019-08-08 stsp if (outfile) {
4341 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4342 33aa809d 2019-08-08 stsp if (n != linelen) {
4343 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4344 33aa809d 2019-08-08 stsp goto done;
4347 33aa809d 2019-08-08 stsp if (rejectfile) {
4348 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4349 33aa809d 2019-08-08 stsp if (n != linelen)
4350 910d235d 2023-01-10 mark err = got_ferror(rejectfile, GOT_ERR_IO);
4353 33aa809d 2019-08-08 stsp free(line);
4354 2ec1f75b 2019-03-26 stsp return err;
4357 33aa809d 2019-08-08 stsp static const struct got_error *
4358 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4360 33aa809d 2019-08-08 stsp char *line = NULL;
4361 33aa809d 2019-08-08 stsp size_t linesize = 0;
4362 33aa809d 2019-08-08 stsp ssize_t linelen;
4364 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4365 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4366 500467ff 2019-09-25 hiltjo if (ferror(f))
4367 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4368 500467ff 2019-09-25 hiltjo return NULL;
4370 33aa809d 2019-08-08 stsp free(line);
4371 33aa809d 2019-08-08 stsp return NULL;
4374 33aa809d 2019-08-08 stsp static const struct got_error *
4375 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4376 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4377 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4379 33aa809d 2019-08-08 stsp const struct got_error *err;
4381 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4382 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4383 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4385 33aa809d 2019-08-08 stsp return err;
4386 33aa809d 2019-08-08 stsp (*line_cur1)++;
4388 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4389 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4390 33aa809d 2019-08-08 stsp if (rejectfile)
4391 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4393 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4395 33aa809d 2019-08-08 stsp return err;
4396 33aa809d 2019-08-08 stsp (*line_cur2)++;
4398 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4399 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4400 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4402 33aa809d 2019-08-08 stsp return err;
4403 33aa809d 2019-08-08 stsp (*line_cur2)++;
4405 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4406 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4407 33aa809d 2019-08-08 stsp if (rejectfile)
4408 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4410 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4412 33aa809d 2019-08-08 stsp return err;
4413 33aa809d 2019-08-08 stsp (*line_cur1)++;
4416 f1e81a05 2019-08-10 stsp return NULL;
4419 f1e81a05 2019-08-10 stsp static const struct got_error *
4420 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4421 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4423 f1e81a05 2019-08-10 stsp const struct got_error *err;
4425 f1e81a05 2019-08-10 stsp if (outfile) {
4426 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4427 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4428 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4430 f1e81a05 2019-08-10 stsp return err;
4431 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4434 f1e81a05 2019-08-10 stsp if (rejectfile) {
4435 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4436 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4437 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4439 f1e81a05 2019-08-10 stsp return err;
4440 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4444 33aa809d 2019-08-08 stsp return NULL;
4447 33aa809d 2019-08-08 stsp static const struct got_error *
4448 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4449 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4450 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4451 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4452 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4454 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4455 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4456 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4457 33aa809d 2019-08-08 stsp FILE *hunkfile;
4458 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4459 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4462 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4464 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4465 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4466 fe621944 2020-11-10 stsp start_old = cc.left.start;
4467 fe621944 2020-11-10 stsp end_old = cc.left.end;
4468 fe621944 2020-11-10 stsp start_new = cc.right.start;
4469 fe621944 2020-11-10 stsp end_new = cc.right.end;
4471 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4472 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4473 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4475 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4476 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4477 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4479 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4480 fe621944 2020-11-10 stsp if (diff_state == NULL)
4481 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4482 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4484 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4485 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4486 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4487 33aa809d 2019-08-08 stsp goto done;
4490 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4491 fe621944 2020-11-10 stsp diff_result, &cc);
4492 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4493 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4494 33aa809d 2019-08-08 stsp goto done;
4497 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4498 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4499 33aa809d 2019-08-08 stsp goto done;
4502 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4503 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4505 33aa809d 2019-08-08 stsp goto done;
4507 33aa809d 2019-08-08 stsp switch (*choice) {
4508 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4509 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4510 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4512 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4513 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4514 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4516 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4519 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4523 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4524 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4525 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4526 33aa809d 2019-08-08 stsp return err;
4529 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4530 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4531 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4532 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4533 1f1abb7e 2019-08-08 stsp void *progress_arg;
4534 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4535 33aa809d 2019-08-08 stsp void *patch_arg;
4536 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4537 f259c4c1 2021-09-24 stsp int unlink_added_files;
4540 e20a8b6f 2019-06-04 stsp static const struct got_error *
4541 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4542 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4543 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4544 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4545 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4547 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4548 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4549 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4550 eb81bc23 2022-06-28 tracey int fd = -1, fd2 = -1;
4551 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4552 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4553 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4554 fe621944 2020-11-10 stsp struct stat sb2;
4555 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4556 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4557 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4559 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4561 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4563 33aa809d 2019-08-08 stsp return err;
4565 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4566 e7ae0baf 2021-12-31 stsp fd2 = openat(dirfd2, de_name2,
4567 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4568 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4569 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4570 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4571 fa3cef63 2020-07-23 stsp goto done;
4573 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4574 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4575 c0df5966 2021-12-31 stsp if (link_len == -1) {
4576 c0df5966 2021-12-31 stsp return got_error_from_errno2("readlinkat",
4579 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4580 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4583 8bd0cdad 2021-12-31 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4584 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4585 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4586 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4587 fa3cef63 2020-07-23 stsp goto done;
4589 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4590 fa3cef63 2020-07-23 stsp sizeof(link_target));
4591 fa3cef63 2020-07-23 stsp if (link_len == -1)
4592 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4593 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4594 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4597 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4598 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4599 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4600 fa3cef63 2020-07-23 stsp goto done;
4603 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4604 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4605 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4606 fa3cef63 2020-07-23 stsp goto done;
4611 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4612 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4613 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4614 fa3cef63 2020-07-23 stsp goto done;
4616 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4617 fa3cef63 2020-07-23 stsp if (n != link_len) {
4618 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4619 fa3cef63 2020-07-23 stsp goto done;
4621 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4622 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4623 fa3cef63 2020-07-23 stsp goto done;
4625 fa3cef63 2020-07-23 stsp rewind(f2);
4628 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4629 eb81bc23 2022-06-28 tracey if (fd == -1) {
4630 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4631 eb81bc23 2022-06-28 tracey goto done;
4634 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4636 33aa809d 2019-08-08 stsp goto done;
4638 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4640 33aa809d 2019-08-08 stsp goto done;
4642 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4644 33aa809d 2019-08-08 stsp goto done;
4646 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4647 4b752015 2022-06-30 stsp 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4649 33aa809d 2019-08-08 stsp goto done;
4651 b90054ed 2022-11-01 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4654 33aa809d 2019-08-08 stsp goto done;
4656 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4657 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4658 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4659 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4661 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4662 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4663 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4664 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4665 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4666 fe621944 2020-11-10 stsp nchanges++;
4668 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4669 33aa809d 2019-08-08 stsp int choice;
4670 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4671 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4672 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4673 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4674 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4675 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4677 33aa809d 2019-08-08 stsp goto done;
4678 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4679 33aa809d 2019-08-08 stsp have_content = 1;
4680 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4683 1ebedb77 2019-10-19 stsp if (have_content) {
4684 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4685 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4686 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4688 1ebedb77 2019-10-19 stsp goto done;
4690 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4691 b2b3fce1 2022-10-29 op mode_t mode;
4693 b2b3fce1 2022-10-29 op mode = apply_umask(sb2.st_mode);
4694 b2b3fce1 2022-10-29 op if (fchmod(fileno(outfile), mode) == -1) {
4695 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4696 fa3cef63 2020-07-23 stsp goto done;
4701 33aa809d 2019-08-08 stsp free(id_str);
4702 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4703 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4705 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4706 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4707 fe621944 2020-11-10 stsp if (err == NULL)
4708 fe621944 2020-11-10 stsp err = free_err;
4709 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4710 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4711 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4712 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4713 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4714 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4715 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4716 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4717 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4718 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4719 33aa809d 2019-08-08 stsp if (err || !have_content) {
4720 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4721 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4722 33aa809d 2019-08-08 stsp free(*path_outfile);
4723 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4725 33aa809d 2019-08-08 stsp free(path1);
4726 33aa809d 2019-08-08 stsp return err;
4729 33aa809d 2019-08-08 stsp static const struct got_error *
4730 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4731 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4732 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4733 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4735 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4736 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4737 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4738 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4739 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit = NULL;
4740 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4741 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4742 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4743 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4744 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4745 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4746 eb81bc23 2022-06-28 tracey int fd = -1;
4748 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4749 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4750 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4751 d3bcc3d1 2019-08-08 stsp return NULL;
4753 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4754 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4755 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4757 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4758 65084dad 2019-08-08 stsp if (ie == NULL)
4759 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4761 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4762 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4763 a129376b 2019-03-28 stsp if (err) {
4764 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4765 a129376b 2019-03-28 stsp goto done;
4766 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4767 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4768 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4769 e20a8b6f 2019-06-04 stsp goto done;
4772 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4773 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4774 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4775 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4776 a129376b 2019-03-28 stsp goto done;
4779 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4780 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4781 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4782 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4783 a129376b 2019-03-28 stsp goto done;
4786 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4787 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4788 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4789 a129376b 2019-03-28 stsp goto done;
4794 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&base_commit, a->repo,
4795 a44927cc 2022-04-07 stsp a->worktree->base_commit_id);
4797 a44927cc 2022-04-07 stsp goto done;
4799 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4800 a9fa2909 2019-07-27 stsp if (err) {
4801 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4802 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4803 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4804 a9fa2909 2019-07-27 stsp goto done;
4806 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4808 a9fa2909 2019-07-27 stsp goto done;
4810 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4812 a9fa2909 2019-07-27 stsp goto done;
4814 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4815 1233e6b6 2020-10-19 stsp free(te_name);
4816 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4817 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4818 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4819 a9fa2909 2019-07-27 stsp goto done;
4823 a129376b 2019-03-28 stsp switch (status) {
4824 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4825 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4826 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4827 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4828 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4830 33aa809d 2019-08-08 stsp goto done;
4831 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4834 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4835 1f1abb7e 2019-08-08 stsp ie->path);
4837 1ee397ad 2019-07-12 stsp goto done;
4838 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4839 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4840 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4841 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4842 f259c4c1 2021-09-24 stsp relpath) == -1) {
4843 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4844 f259c4c1 2021-09-24 stsp goto done;
4846 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4847 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4848 f259c4c1 2021-09-24 stsp ondisk_path);
4853 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4854 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4855 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4856 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4857 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4859 33aa809d 2019-08-08 stsp goto done;
4860 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4863 33aa809d 2019-08-08 stsp /* fall through */
4864 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4865 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4866 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4867 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4868 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4869 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4870 b4b2adf5 2023-02-09 op staged_status == GOT_STATUS_MODIFY)
4871 b4b2adf5 2023-02-09 op got_fileindex_entry_get_staged_blob_id(&id, ie);
4873 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&id, ie);
4874 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4875 eb81bc23 2022-06-28 tracey if (fd == -1) {
4876 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4877 eb81bc23 2022-06-28 tracey goto done;
4880 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4882 65084dad 2019-08-08 stsp goto done;
4884 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4885 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4886 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4887 a129376b 2019-03-28 stsp goto done;
4890 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4891 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4892 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4893 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4894 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4895 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4896 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4898 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4899 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4900 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4901 369fd7e5 2020-07-23 stsp path_content);
4904 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4905 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4906 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4907 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4909 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4910 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4911 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4912 369fd7e5 2020-07-23 stsp goto done;
4916 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4917 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4918 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4919 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4920 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4921 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4923 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4925 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4926 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4927 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4928 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4931 a129376b 2019-03-28 stsp goto done;
4932 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4933 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4934 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4935 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4936 437adc9d 2020-12-10 yzhong blob->id.sha1,
4937 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4939 2e1fa222 2020-07-23 stsp goto done;
4941 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4942 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4943 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4952 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4953 33aa809d 2019-08-08 stsp free(path_content);
4954 e20a8b6f 2019-06-04 stsp free(parent_path);
4955 a129376b 2019-03-28 stsp free(tree_path);
4956 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4957 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4959 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4961 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4962 a129376b 2019-03-28 stsp free(tree_id);
4963 a44927cc 2022-04-07 stsp if (base_commit)
4964 a44927cc 2022-04-07 stsp got_object_commit_close(base_commit);
4965 e20a8b6f 2019-06-04 stsp return err;
4968 e20a8b6f 2019-06-04 stsp const struct got_error *
4969 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4970 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4971 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4972 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4973 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4975 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4976 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4977 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4978 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4979 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4980 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4982 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4984 e20a8b6f 2019-06-04 stsp return err;
4986 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4988 e20a8b6f 2019-06-04 stsp goto done;
4990 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4991 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4992 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4993 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4994 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4995 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4996 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4997 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4998 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4999 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5000 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
5004 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5005 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
5006 e20a8b6f 2019-06-04 stsp err = sync_err;
5008 fb399478 2019-07-12 stsp free(fileindex_path);
5009 a129376b 2019-03-28 stsp if (fileindex)
5010 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
5011 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5012 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
5013 a129376b 2019-03-28 stsp err = unlockerr;
5014 c4296144 2019-05-09 stsp return err;
5017 cf066bf8 2019-05-09 stsp static void
5018 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
5020 24519714 2019-05-09 stsp free(ct->path);
5021 44d03001 2019-05-09 stsp free(ct->in_repo_path);
5022 768aea60 2019-05-09 stsp free(ct->ondisk_path);
5023 e75eb4da 2019-05-10 stsp free(ct->blob_id);
5024 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
5025 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
5026 b416585c 2019-05-13 stsp free(ct->base_commit_id);
5030 ed175427 2019-05-09 stsp struct collect_commitables_arg {
5031 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
5032 24519714 2019-05-09 stsp struct got_repository *repo;
5033 24519714 2019-05-09 stsp struct got_worktree *worktree;
5034 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
5035 5f8a88c6 2019-08-03 stsp int have_staged_files;
5036 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
5037 2a47b1e5 2022-11-01 stsp int diff_header_shown;
5038 12383673 2023-02-18 mark int commit_conflicts;
5039 2a47b1e5 2022-11-01 stsp FILE *diff_outfile;
5045 2a47b1e5 2022-11-01 stsp * Create a file which contains the target path of a symlink so we can feed
5046 2a47b1e5 2022-11-01 stsp * it as content to the diff engine.
5048 2a47b1e5 2022-11-01 stsp static const struct got_error *
5049 2a47b1e5 2022-11-01 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
5050 2a47b1e5 2022-11-01 stsp const char *abspath)
5052 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
5053 2a47b1e5 2022-11-01 stsp char target_path[PATH_MAX];
5054 2a47b1e5 2022-11-01 stsp ssize_t target_len, outlen;
5058 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
5059 2a47b1e5 2022-11-01 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
5060 2a47b1e5 2022-11-01 stsp if (target_len == -1)
5061 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlinkat", abspath);
5063 2a47b1e5 2022-11-01 stsp target_len = readlink(abspath, target_path, PATH_MAX);
5064 2a47b1e5 2022-11-01 stsp if (target_len == -1)
5065 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlink", abspath);
5068 2a47b1e5 2022-11-01 stsp *fd = got_opentempfd();
5069 2a47b1e5 2022-11-01 stsp if (*fd == -1)
5070 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentempfd");
5072 2a47b1e5 2022-11-01 stsp outlen = write(*fd, target_path, target_len);
5073 2a47b1e5 2022-11-01 stsp if (outlen == -1) {
5074 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5075 2a47b1e5 2022-11-01 stsp goto done;
5078 2a47b1e5 2022-11-01 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
5079 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("lseek", abspath);
5080 2a47b1e5 2022-11-01 stsp goto done;
5083 2a47b1e5 2022-11-01 stsp if (err) {
5084 2a47b1e5 2022-11-01 stsp close(*fd);
5087 2a47b1e5 2022-11-01 stsp return err;
5090 2a47b1e5 2022-11-01 stsp static const struct got_error *
5091 2a47b1e5 2022-11-01 stsp append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5092 2a47b1e5 2022-11-01 stsp FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5093 6d15dc69 2022-11-01 stsp int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5095 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
5096 2a47b1e5 2022-11-01 stsp struct got_blob_object *blob1 = NULL;
5097 2a47b1e5 2022-11-01 stsp int fd = -1, fd1 = -1, fd2 = -1;
5098 2a47b1e5 2022-11-01 stsp FILE *ondisk_file = NULL;
5099 2a47b1e5 2022-11-01 stsp char *label1 = NULL;
5100 2a47b1e5 2022-11-01 stsp struct stat sb;
5101 2a47b1e5 2022-11-01 stsp off_t size1 = 0;
5102 2a47b1e5 2022-11-01 stsp int f2_exists = 0;
5103 2a47b1e5 2022-11-01 stsp char *id_str = NULL;
5105 2a47b1e5 2022-11-01 stsp memset(&sb, 0, sizeof(sb));
5107 4ba5cca9 2022-11-01 stsp if (diff_staged) {
5108 4ba5cca9 2022-11-01 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5109 4ba5cca9 2022-11-01 stsp ct->staged_status != GOT_STATUS_ADD &&
5110 4ba5cca9 2022-11-01 stsp ct->staged_status != GOT_STATUS_DELETE)
5111 4ba5cca9 2022-11-01 stsp return NULL;
5113 4ba5cca9 2022-11-01 stsp if (ct->status != GOT_STATUS_MODIFY &&
5114 4ba5cca9 2022-11-01 stsp ct->status != GOT_STATUS_ADD &&
5115 12383673 2023-02-18 mark ct->status != GOT_STATUS_DELETE &&
5116 12383673 2023-02-18 mark ct->status != GOT_STATUS_CONFLICT)
5117 4ba5cca9 2022-11-01 stsp return NULL;
5120 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f1);
5122 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5123 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f2);
5125 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5127 2a47b1e5 2022-11-01 stsp if (!*diff_header_shown) {
5128 2a47b1e5 2022-11-01 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
5130 2a47b1e5 2022-11-01 stsp return err;
5131 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5132 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree));
5133 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "commit - %s\n", id_str);
5134 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "path + %s%s\n",
5135 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree),
5136 2a47b1e5 2022-11-01 stsp diff_staged ? " (staged changes)" : "");
5137 2a47b1e5 2022-11-01 stsp *diff_header_shown = 1;
5140 2a47b1e5 2022-11-01 stsp if (diff_staged) {
5141 2a47b1e5 2022-11-01 stsp const char *label1 = NULL, *label2 = NULL;
5142 2a47b1e5 2022-11-01 stsp switch (ct->staged_status) {
5143 2a47b1e5 2022-11-01 stsp case GOT_STATUS_MODIFY:
5144 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5145 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5147 2a47b1e5 2022-11-01 stsp case GOT_STATUS_ADD:
5148 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5150 2a47b1e5 2022-11-01 stsp case GOT_STATUS_DELETE:
5151 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5154 2a47b1e5 2022-11-01 stsp return got_error(GOT_ERR_FILE_STATUS);
5156 2a47b1e5 2022-11-01 stsp fd1 = got_opentempfd();
5157 2a47b1e5 2022-11-01 stsp if (fd1 == -1) {
5158 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5159 2a47b1e5 2022-11-01 stsp goto done;
5161 2a47b1e5 2022-11-01 stsp fd2 = got_opentempfd();
5162 2a47b1e5 2022-11-01 stsp if (fd2 == -1) {
5163 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5164 2a47b1e5 2022-11-01 stsp goto done;
5166 2a47b1e5 2022-11-01 stsp err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5167 2a47b1e5 2022-11-01 stsp fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5168 1f3405c9 2023-01-17 mark label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5169 a76e88e5 2023-01-10 mark NULL, repo, diff_outfile);
5170 2a47b1e5 2022-11-01 stsp goto done;
5173 2a47b1e5 2022-11-01 stsp fd1 = got_opentempfd();
5174 2a47b1e5 2022-11-01 stsp if (fd1 == -1) {
5175 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5176 2a47b1e5 2022-11-01 stsp goto done;
5179 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_ADD) {
5180 2a47b1e5 2022-11-01 stsp err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5181 2a47b1e5 2022-11-01 stsp 8192, fd1);
5183 2a47b1e5 2022-11-01 stsp goto done;
5186 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_DELETE) {
5187 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
5188 2a47b1e5 2022-11-01 stsp fd = openat(dirfd, de_name,
5189 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5190 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5191 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5192 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("openat",
5193 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5194 2a47b1e5 2022-11-01 stsp goto done;
5196 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5197 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5199 2a47b1e5 2022-11-01 stsp goto done;
5202 2a47b1e5 2022-11-01 stsp fd = open(ct->ondisk_path,
5203 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5204 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5205 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5206 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("open",
5207 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5208 2a47b1e5 2022-11-01 stsp goto done;
5210 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5211 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5213 2a47b1e5 2022-11-01 stsp goto done;
5216 2a47b1e5 2022-11-01 stsp if (fstatat(fd, ct->ondisk_path, &sb,
5217 2a47b1e5 2022-11-01 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5218 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fstatat", ct->ondisk_path);
5219 2a47b1e5 2022-11-01 stsp goto done;
5221 2a47b1e5 2022-11-01 stsp ondisk_file = fdopen(fd, "r");
5222 2a47b1e5 2022-11-01 stsp if (ondisk_file == NULL) {
5223 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fdopen", ct->ondisk_path);
5224 2a47b1e5 2022-11-01 stsp goto done;
5227 2a47b1e5 2022-11-01 stsp f2_exists = 1;
5230 2a47b1e5 2022-11-01 stsp if (blob1) {
5231 2a47b1e5 2022-11-01 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5232 2a47b1e5 2022-11-01 stsp f1, blob1);
5234 2a47b1e5 2022-11-01 stsp goto done;
5237 2a47b1e5 2022-11-01 stsp err = got_diff_blob_file(blob1, f1, size1, label1,
5238 2a47b1e5 2022-11-01 stsp ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5239 1f3405c9 2023-01-17 mark GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5241 2a47b1e5 2022-11-01 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5242 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5243 2a47b1e5 2022-11-01 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5244 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5245 2a47b1e5 2022-11-01 stsp if (blob1)
5246 2a47b1e5 2022-11-01 stsp got_object_blob_close(blob1);
5247 2a47b1e5 2022-11-01 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5248 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5249 2a47b1e5 2022-11-01 stsp if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5250 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
5251 2a47b1e5 2022-11-01 stsp return err;
5254 c4296144 2019-05-09 stsp static const struct got_error *
5255 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
5256 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
5257 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5258 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
5260 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
5261 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
5262 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5263 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
5264 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
5265 768aea60 2019-05-09 stsp struct stat sb;
5267 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
5268 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
5269 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
5270 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5271 5f8a88c6 2019-08-03 stsp return NULL;
5273 12383673 2023-02-18 mark if (status == GOT_STATUS_CONFLICT && !a->commit_conflicts) {
5274 12383673 2023-02-18 mark printf("C %s\n", relpath);
5275 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
5278 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
5279 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
5280 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
5281 12383673 2023-02-18 mark status != GOT_STATUS_DELETE &&
5282 12383673 2023-02-18 mark status != GOT_STATUS_CONFLICT)
5283 5f8a88c6 2019-08-03 stsp return NULL;
5286 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
5287 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5288 036813ee 2019-05-09 stsp goto done;
5290 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
5291 036813ee 2019-05-09 stsp parent_path = strdup("");
5292 69960a46 2019-05-09 stsp if (parent_path == NULL)
5293 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
5295 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
5297 69960a46 2019-05-09 stsp return err;
5300 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
5301 cf066bf8 2019-05-09 stsp if (ct == NULL) {
5302 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
5303 c4296144 2019-05-09 stsp goto done;
5306 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5307 768aea60 2019-05-09 stsp relpath) == -1) {
5308 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5309 768aea60 2019-05-09 stsp goto done;
5312 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
5313 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
5314 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
5315 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5316 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
5317 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
5318 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
5319 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
5321 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
5322 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
5325 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5326 0aeb8099 2020-07-23 stsp goto done;
5328 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
5329 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
5330 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
5331 12463d8b 2019-12-13 stsp if (dirfd != -1) {
5332 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
5333 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5334 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
5335 12463d8b 2019-12-13 stsp ct->ondisk_path);
5336 12463d8b 2019-12-13 stsp goto done;
5338 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
5339 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
5340 768aea60 2019-05-09 stsp goto done;
5342 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5345 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5346 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5347 44d03001 2019-05-09 stsp relpath) == -1) {
5348 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5349 44d03001 2019-05-09 stsp goto done;
5352 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5353 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5354 35213c7c 2020-07-23 stsp int is_bad_symlink;
5355 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5356 35213c7c 2020-07-23 stsp ssize_t target_len;
5357 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5358 35213c7c 2020-07-23 stsp sizeof(target_path));
5359 35213c7c 2020-07-23 stsp if (target_len == -1) {
5360 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5361 35213c7c 2020-07-23 stsp ct->ondisk_path);
5362 35213c7c 2020-07-23 stsp goto done;
5364 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5365 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5367 35213c7c 2020-07-23 stsp goto done;
5368 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5369 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5370 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5371 35213c7c 2020-07-23 stsp goto done;
5376 cf066bf8 2019-05-09 stsp ct->status = status;
5377 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5378 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5379 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5380 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5381 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5382 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5383 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5384 b416585c 2019-05-13 stsp goto done;
5386 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5387 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5388 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5389 f0b75401 2019-08-03 stsp goto done;
5392 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5393 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5394 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5395 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5396 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5397 036813ee 2019-05-09 stsp goto done;
5400 24519714 2019-05-09 stsp ct->path = strdup(path);
5401 24519714 2019-05-09 stsp if (ct->path == NULL) {
5402 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5403 24519714 2019-05-09 stsp goto done;
5405 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5407 2a47b1e5 2022-11-01 stsp goto done;
5409 2a47b1e5 2022-11-01 stsp if (a->diff_outfile && ct && new != NULL) {
5410 2a47b1e5 2022-11-01 stsp err = append_ct_diff(ct, &a->diff_header_shown,
5411 2a47b1e5 2022-11-01 stsp a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5412 6d15dc69 2022-11-01 stsp a->have_staged_files, a->repo, a->worktree);
5414 2a47b1e5 2022-11-01 stsp goto done;
5417 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5418 ed175427 2019-05-09 stsp free_commitable(ct);
5419 24519714 2019-05-09 stsp free(parent_path);
5420 036813ee 2019-05-09 stsp free(path);
5421 a129376b 2019-03-28 stsp return err;
5424 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5425 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5426 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5427 036813ee 2019-05-09 stsp struct got_repository *);
5429 ed175427 2019-05-09 stsp static const struct got_error *
5430 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5431 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5432 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5433 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5434 afa376bf 2019-05-09 stsp struct got_repository *repo)
5436 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5437 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5438 036813ee 2019-05-09 stsp char *subpath;
5440 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5441 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5442 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5444 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5446 ed175427 2019-05-09 stsp return err;
5448 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5449 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5450 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5451 036813ee 2019-05-09 stsp free(subpath);
5452 036813ee 2019-05-09 stsp return err;
5455 036813ee 2019-05-09 stsp static const struct got_error *
5456 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5458 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5459 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5461 036813ee 2019-05-09 stsp *match = 0;
5463 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5464 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5465 0f63689d 2019-05-10 stsp return NULL;
5468 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5470 0f63689d 2019-05-10 stsp return err;
5471 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5472 036813ee 2019-05-09 stsp free(ct_parent_path);
5473 036813ee 2019-05-09 stsp return err;
5476 768aea60 2019-05-09 stsp static mode_t
5477 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5479 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5480 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5482 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5485 036813ee 2019-05-09 stsp static const struct got_error *
5486 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5487 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5489 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5491 036813ee 2019-05-09 stsp *new_te = NULL;
5493 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5495 036813ee 2019-05-09 stsp goto done;
5497 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5499 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5500 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5501 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5503 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5505 036813ee 2019-05-09 stsp if (err && *new_te) {
5506 56e0773d 2019-11-28 stsp free(*new_te);
5507 036813ee 2019-05-09 stsp *new_te = NULL;
5509 036813ee 2019-05-09 stsp return err;
5512 036813ee 2019-05-09 stsp static const struct got_error *
5513 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5514 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5516 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5517 102b254e 2020-10-19 stsp char *ct_name = NULL;
5519 036813ee 2019-05-09 stsp *new_te = NULL;
5521 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5522 036813ee 2019-05-09 stsp if (*new_te == NULL)
5523 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5525 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5527 036813ee 2019-05-09 stsp goto done;
5528 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5529 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5530 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5531 036813ee 2019-05-09 stsp goto done;
5534 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5536 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5537 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5538 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5540 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5542 102b254e 2020-10-19 stsp free(ct_name);
5543 036813ee 2019-05-09 stsp if (err && *new_te) {
5544 56e0773d 2019-11-28 stsp free(*new_te);
5545 036813ee 2019-05-09 stsp *new_te = NULL;
5547 036813ee 2019-05-09 stsp return err;
5550 036813ee 2019-05-09 stsp static const struct got_error *
5551 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5552 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5554 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5555 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5557 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5559 036813ee 2019-05-09 stsp return err;
5560 036813ee 2019-05-09 stsp if (new_pe == NULL)
5561 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5562 036813ee 2019-05-09 stsp return NULL;
5565 afa376bf 2019-05-09 stsp static const struct got_error *
5566 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5567 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5569 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5570 5f8a88c6 2019-08-03 stsp unsigned char status;
5572 0ff8d236 2021-09-28 stsp if (status_cb == NULL) /* no commit progress output desired */
5573 0ff8d236 2021-09-28 stsp return NULL;
5575 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5576 afa376bf 2019-05-09 stsp ct_path++;
5578 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5579 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5581 5f8a88c6 2019-08-03 stsp status = ct->status;
5583 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5584 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5587 036813ee 2019-05-09 stsp static const struct got_error *
5588 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5589 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5591 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5592 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5593 44d03001 2019-05-09 stsp char *te_path;
5595 44d03001 2019-05-09 stsp *modified = 0;
5597 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5598 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5599 44d03001 2019-05-09 stsp te->name) == -1)
5600 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5602 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5603 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5604 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5605 44d03001 2019-05-09 stsp strlen(te_path));
5606 62d463ca 2020-10-20 naddy if (*modified)
5610 44d03001 2019-05-09 stsp free(te_path);
5611 44d03001 2019-05-09 stsp return err;
5614 44d03001 2019-05-09 stsp static const struct got_error *
5615 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5616 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5617 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5619 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5620 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5622 036813ee 2019-05-09 stsp *ctp = NULL;
5624 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5625 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5626 036813ee 2019-05-09 stsp char *ct_name = NULL;
5627 036813ee 2019-05-09 stsp int path_matches;
5629 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5630 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5631 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5632 12383673 2023-02-18 mark ct->status != GOT_STATUS_DELETE &&
5633 12383673 2023-02-18 mark ct->status != GOT_STATUS_CONFLICT)
5636 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5637 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5641 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5644 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5646 036813ee 2019-05-09 stsp return err;
5647 036813ee 2019-05-09 stsp if (!path_matches)
5650 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5652 d34b633e 2020-10-19 stsp return err;
5654 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5655 d34b633e 2020-10-19 stsp free(ct_name);
5658 d34b633e 2020-10-19 stsp free(ct_name);
5660 036813ee 2019-05-09 stsp *ctp = ct;
5664 2b496619 2019-07-10 stsp return err;
5667 2b496619 2019-07-10 stsp static const struct got_error *
5668 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5669 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5670 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5671 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5672 2b496619 2019-07-10 stsp struct got_repository *repo)
5674 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5675 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5676 2b496619 2019-07-10 stsp char *subtree_path;
5677 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5678 ba580f68 2020-03-22 stsp int nentries;
5680 2b496619 2019-07-10 stsp *new_tep = NULL;
5682 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5683 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5684 2b496619 2019-07-10 stsp child_path) == -1)
5685 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5687 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5688 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5689 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5690 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5692 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5693 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5694 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5695 2b496619 2019-07-10 stsp goto done;
5697 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5698 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5699 2b496619 2019-07-10 stsp if (err) {
5700 56e0773d 2019-11-28 stsp free(new_te);
5701 2b496619 2019-07-10 stsp goto done;
5703 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5706 2b496619 2019-07-10 stsp free(subtree_path);
5707 2b496619 2019-07-10 stsp if (err == NULL)
5708 2b496619 2019-07-10 stsp *new_tep = new_te;
5709 036813ee 2019-05-09 stsp return err;
5712 036813ee 2019-05-09 stsp static const struct got_error *
5713 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5714 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5715 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5716 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5717 036813ee 2019-05-09 stsp struct got_repository *repo)
5719 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5720 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5721 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5722 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5724 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5725 ba580f68 2020-03-22 stsp *nentries = 0;
5727 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5728 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5729 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5730 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5732 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5733 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5734 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5737 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5738 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5741 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5742 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5744 036813ee 2019-05-09 stsp goto done;
5746 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5747 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5748 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5750 036813ee 2019-05-09 stsp goto done;
5751 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5753 afa376bf 2019-05-09 stsp goto done;
5754 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5755 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5757 2f51b5b3 2019-05-09 stsp goto done;
5758 ba580f68 2020-03-22 stsp (*nentries)++;
5760 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5761 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5762 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5763 2b496619 2019-07-10 stsp == NULL) {
5764 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5765 2b496619 2019-07-10 stsp child_path, path_base_tree,
5766 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5769 2b496619 2019-07-10 stsp goto done;
5770 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5772 2b496619 2019-07-10 stsp goto done;
5773 ba580f68 2020-03-22 stsp (*nentries)++;
5778 2f51b5b3 2019-05-09 stsp if (base_tree) {
5779 56e0773d 2019-11-28 stsp int i, nbase_entries;
5780 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5781 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5782 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5783 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5785 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5786 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5787 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5788 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5790 63c5ca5d 2019-08-24 stsp goto done;
5791 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5793 63c5ca5d 2019-08-24 stsp goto done;
5794 ba580f68 2020-03-22 stsp (*nentries)++;
5798 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5799 44d03001 2019-05-09 stsp int modified;
5800 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5802 036813ee 2019-05-09 stsp goto done;
5803 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5804 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5806 2f51b5b3 2019-05-09 stsp goto done;
5807 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5808 44d03001 2019-05-09 stsp if (modified) {
5809 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5810 ba580f68 2020-03-22 stsp int nsubentries;
5811 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5812 ba580f68 2020-03-22 stsp &nsubentries, te,
5813 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5814 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5816 44d03001 2019-05-09 stsp goto done;
5817 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5818 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5819 ba580f68 2020-03-22 stsp free(new_id);
5822 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5823 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5824 56e0773d 2019-11-28 stsp free(new_id);
5826 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5828 036813ee 2019-05-09 stsp goto done;
5829 ba580f68 2020-03-22 stsp (*nentries)++;
5833 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5834 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5836 f66c734c 2019-09-22 stsp goto done;
5838 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5839 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5840 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5841 12383673 2023-02-18 mark ct->status == GOT_STATUS_CONFLICT ||
5842 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5843 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5844 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5846 2f51b5b3 2019-05-09 stsp goto done;
5847 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5849 2f51b5b3 2019-05-09 stsp goto done;
5850 ba580f68 2020-03-22 stsp (*nentries)++;
5852 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5853 b416585c 2019-05-13 stsp status_arg);
5855 afa376bf 2019-05-09 stsp goto done;
5857 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5858 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5860 2f51b5b3 2019-05-09 stsp goto done;
5861 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5863 2f51b5b3 2019-05-09 stsp goto done;
5864 ba580f68 2020-03-22 stsp (*nentries)++;
5869 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5870 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5872 d8bacb93 2023-01-10 mark got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5873 2e1fa222 2020-07-23 stsp return err;
5876 2e1fa222 2020-07-23 stsp static const struct got_error *
5877 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5878 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5879 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5880 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5882 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5883 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5884 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5886 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5887 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5888 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5890 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5892 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5893 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5894 437adc9d 2020-12-10 yzhong if (err)
5895 437adc9d 2020-12-10 yzhong goto done;
5898 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5899 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5900 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5901 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5902 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5903 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5904 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5905 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5907 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5908 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5909 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5910 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5911 72fd46fa 2019-09-06 stsp !have_staged_files);
5913 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5914 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5915 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5916 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5917 72fd46fa 2019-09-06 stsp !have_staged_files);
5919 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5921 437adc9d 2020-12-10 yzhong goto done;
5922 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5923 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5924 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5925 3969253a 2020-03-07 stsp if (err) {
5926 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5927 437adc9d 2020-12-10 yzhong goto done;
5929 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5930 3969253a 2020-03-07 stsp if (err) {
5931 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5932 437adc9d 2020-12-10 yzhong goto done;
5935 437adc9d 2020-12-10 yzhong free(relpath);
5936 437adc9d 2020-12-10 yzhong relpath = NULL;
5939 437adc9d 2020-12-10 yzhong free(relpath);
5940 d56d26ce 2019-05-10 stsp return err;
5944 d56d26ce 2019-05-10 stsp static const struct got_error *
5945 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5946 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5947 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5948 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5949 735ef5ac 2019-08-03 stsp int ood_errcode)
5951 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5952 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
5953 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5955 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5956 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5957 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5958 1a36436d 2019-06-10 stsp return NULL;
5960 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5961 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5963 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5965 a44927cc 2022-04-07 stsp goto done;
5966 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5967 9bead371 2019-07-28 stsp if (err) {
5968 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5969 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5970 1a36436d 2019-06-10 stsp goto done;
5971 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5972 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5974 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5975 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5977 a44927cc 2022-04-07 stsp goto done;
5978 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5979 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5980 1a36436d 2019-06-10 stsp goto done;
5981 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5985 a44927cc 2022-04-07 stsp if (commit)
5986 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
5987 1a36436d 2019-06-10 stsp return err;
5990 336075a4 2022-06-25 op static const struct got_error *
5991 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5992 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5993 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5994 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5995 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5996 2a47b1e5 2022-11-01 stsp const char *author, const char *committer, char *diff_path,
5997 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5998 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5999 afa376bf 2019-05-09 stsp struct got_repository *repo)
6001 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
6002 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
6003 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
6004 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
6005 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
6006 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
6007 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
6008 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
6009 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
6010 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
6011 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
6012 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
6013 f8399b8f 2022-07-22 stsp time_t timestamp;
6015 c4296144 2019-05-09 stsp *new_commit_id = NULL;
6017 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
6019 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
6021 588edf97 2019-05-10 stsp goto done;
6023 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
6025 588edf97 2019-05-10 stsp goto done;
6027 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
6028 2a47b1e5 2022-11-01 stsp err = commit_msg_cb(commitable_paths, diff_path,
6029 2a47b1e5 2022-11-01 stsp &logmsg, commit_arg);
6034 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
6035 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6039 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
6040 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
6041 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6042 cf066bf8 2019-05-09 stsp char *ondisk_path;
6044 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
6045 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
6046 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
6049 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
6050 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
6051 12383673 2023-02-18 mark ct->status != GOT_STATUS_MODE_CHANGE &&
6052 12383673 2023-02-18 mark ct->status != GOT_STATUS_CONFLICT)
6055 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
6056 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
6057 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
6058 cf066bf8 2019-05-09 stsp goto done;
6060 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
6061 2e1fa222 2020-07-23 stsp free(ondisk_path);
6063 cf066bf8 2019-05-09 stsp goto done;
6066 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
6067 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
6068 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
6070 036813ee 2019-05-09 stsp goto done;
6072 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
6074 de18fc63 2019-05-09 stsp goto done;
6075 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6076 f259c4c1 2021-09-24 stsp nparents++;
6077 f259c4c1 2021-09-24 stsp if (parent_id2) {
6078 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
6080 f259c4c1 2021-09-24 stsp goto done;
6081 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6082 f259c4c1 2021-09-24 stsp nparents++;
6084 f8399b8f 2022-07-22 stsp timestamp = time(NULL);
6085 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
6086 f8399b8f 2022-07-22 stsp nparents, author, timestamp, committer, timestamp, logmsg, repo);
6087 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
6088 33ad4cbe 2019-05-12 jcs free(logmsg);
6090 9d40349a 2019-05-09 stsp goto done;
6092 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
6093 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
6094 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
6095 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
6096 09f5bd90 2019-05-09 stsp goto done;
6098 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
6099 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6101 09f5bd90 2019-05-09 stsp goto done;
6102 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6104 ebf99748 2019-05-09 stsp goto done;
6105 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6106 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6107 09f5bd90 2019-05-09 stsp goto done;
6109 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
6110 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
6112 f2c16586 2019-05-09 stsp goto done;
6113 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
6115 f2c16586 2019-05-09 stsp goto done;
6117 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6119 09f5bd90 2019-05-09 stsp goto done;
6121 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
6123 ebf99748 2019-05-09 stsp goto done;
6125 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
6126 588edf97 2019-05-10 stsp if (head_tree)
6127 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
6128 588edf97 2019-05-10 stsp if (head_commit)
6129 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
6130 09f5bd90 2019-05-09 stsp free(head_commit_id2);
6131 2f17228e 2019-05-12 stsp if (head_ref2) {
6132 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
6133 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
6134 2f17228e 2019-05-12 stsp err = unlockerr;
6135 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
6137 39cd0ff6 2019-07-12 stsp return err;
6140 5c1e53bc 2019-07-28 stsp static const struct got_error *
6141 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
6142 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
6144 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
6145 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
6147 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
6148 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
6149 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
6151 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
6152 5c1e53bc 2019-07-28 stsp ct_path++;
6154 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
6155 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
6159 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
6160 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
6162 5c1e53bc 2019-07-28 stsp return NULL;
6165 f0b75401 2019-08-03 stsp static const struct got_error *
6166 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
6168 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
6170 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6171 f0b75401 2019-08-03 stsp *have_staged_files = 1;
6172 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
6175 f0b75401 2019-08-03 stsp return NULL;
6178 5f8a88c6 2019-08-03 stsp static const struct got_error *
6179 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
6180 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
6182 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
6183 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
6185 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6186 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
6188 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6189 5f8a88c6 2019-08-03 stsp if (ie == NULL)
6190 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6191 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6192 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
6193 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
6196 5f8a88c6 2019-08-03 stsp return NULL;
6199 39cd0ff6 2019-07-12 stsp const struct got_error *
6200 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
6201 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
6202 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
6203 12383673 2023-02-18 mark int show_diff, int commit_conflicts,
6204 12383673 2023-02-18 mark got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6205 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
6206 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
6208 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6209 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
6210 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
6211 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6212 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6213 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
6214 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
6215 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6216 2a47b1e5 2022-11-01 stsp char *diff_path = NULL;
6217 f0b75401 2019-08-03 stsp int have_staged_files = 0;
6219 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
6221 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6222 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6224 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
6226 39cd0ff6 2019-07-12 stsp goto done;
6228 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6230 39cd0ff6 2019-07-12 stsp goto done;
6232 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6234 39cd0ff6 2019-07-12 stsp goto done;
6236 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6238 39cd0ff6 2019-07-12 stsp goto done;
6240 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6241 5f8a88c6 2019-08-03 stsp &have_staged_files);
6242 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
6243 5f8a88c6 2019-08-03 stsp goto done;
6244 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
6245 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
6247 5f8a88c6 2019-08-03 stsp goto done;
6250 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6251 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
6252 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
6253 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
6254 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
6255 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6256 2a47b1e5 2022-11-01 stsp cc_arg.diff_header_shown = 0;
6257 12383673 2023-02-18 mark cc_arg.commit_conflicts = commit_conflicts;
6258 2a47b1e5 2022-11-01 stsp if (show_diff) {
6259 2a47b1e5 2022-11-01 stsp err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6260 b90054ed 2022-11-01 stsp GOT_TMPDIR_STR "/got", ".diff");
6262 2a47b1e5 2022-11-01 stsp goto done;
6263 2a47b1e5 2022-11-01 stsp cc_arg.f1 = got_opentemp();
6264 2a47b1e5 2022-11-01 stsp if (cc_arg.f1 == NULL) {
6265 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6266 2a47b1e5 2022-11-01 stsp goto done;
6268 2a47b1e5 2022-11-01 stsp cc_arg.f2 = got_opentemp();
6269 2a47b1e5 2022-11-01 stsp if (cc_arg.f2 == NULL) {
6270 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6271 2a47b1e5 2022-11-01 stsp goto done;
6275 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6276 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6277 4ba2e955 2022-09-02 sh+got collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6279 5c1e53bc 2019-07-28 stsp goto done;
6282 2a47b1e5 2022-11-01 stsp if (show_diff) {
6283 2a47b1e5 2022-11-01 stsp if (fflush(cc_arg.diff_outfile) == EOF) {
6284 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fflush");
6285 2a47b1e5 2022-11-01 stsp goto done;
6289 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6290 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6291 39cd0ff6 2019-07-12 stsp goto done;
6294 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6295 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
6297 5c1e53bc 2019-07-28 stsp goto done;
6300 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6301 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
6302 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
6304 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
6305 f0b75401 2019-08-03 stsp ct_path++;
6306 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
6307 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6308 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6310 b50cabdf 2019-07-12 stsp goto done;
6314 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
6315 210c2321 2022-11-01 stsp head_commit_id, NULL, worktree, author, committer,
6316 210c2321 2022-11-01 stsp (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6317 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6319 39cd0ff6 2019-07-12 stsp goto done;
6321 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6322 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
6323 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6324 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
6325 39cd0ff6 2019-07-12 stsp err = sync_err;
6327 39cd0ff6 2019-07-12 stsp if (fileindex)
6328 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
6329 39cd0ff6 2019-07-12 stsp free(fileindex_path);
6330 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6331 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
6332 39cd0ff6 2019-07-12 stsp err = unlockerr;
6333 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6334 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
6336 39cd0ff6 2019-07-12 stsp free_commitable(ct);
6338 d8bacb93 2023-01-10 mark got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6339 2a47b1e5 2022-11-01 stsp if (diff_path && unlink(diff_path) == -1 && err == NULL)
6340 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("unlink", diff_path);
6341 2a47b1e5 2022-11-01 stsp free(diff_path);
6342 2a47b1e5 2022-11-01 stsp if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6343 2a47b1e5 2022-11-01 stsp err == NULL)
6344 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
6345 c4296144 2019-05-09 stsp return err;
6348 8656d6c4 2019-05-20 stsp const char *
6349 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
6351 8656d6c4 2019-05-20 stsp return ct->path;
6354 8656d6c4 2019-05-20 stsp unsigned int
6355 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
6357 8656d6c4 2019-05-20 stsp return ct->status;
6360 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
6361 818c7501 2019-07-11 stsp struct got_worktree *worktree;
6362 818c7501 2019-07-11 stsp struct got_repository *repo;
6365 818c7501 2019-07-11 stsp static const struct got_error *
6366 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6368 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6369 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
6370 818c7501 2019-07-11 stsp unsigned char status;
6371 818c7501 2019-07-11 stsp struct stat sb;
6372 818c7501 2019-07-11 stsp char *ondisk_path;
6374 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
6375 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6376 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
6377 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
6379 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6381 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
6383 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
6384 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6385 818c7501 2019-07-11 stsp free(ondisk_path);
6387 818c7501 2019-07-11 stsp return err;
6389 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
6390 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
6391 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6392 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6394 818c7501 2019-07-11 stsp return NULL;
6397 818c7501 2019-07-11 stsp const struct got_error *
6398 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6399 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6400 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
6401 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6403 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6404 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6405 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6406 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6407 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6408 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6409 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6411 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6412 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6413 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6415 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6417 818c7501 2019-07-11 stsp return err;
6419 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6421 818c7501 2019-07-11 stsp goto done;
6423 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6424 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6425 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6428 818c7501 2019-07-11 stsp goto done;
6430 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6432 818c7501 2019-07-11 stsp goto done;
6434 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6436 818c7501 2019-07-11 stsp goto done;
6438 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6440 818c7501 2019-07-11 stsp goto done;
6442 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6445 e51d7b55 2020-01-04 stsp goto done;
6447 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6449 818c7501 2019-07-11 stsp goto done;
6450 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6451 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6452 e51d7b55 2020-01-04 stsp goto done;
6455 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6456 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6458 818c7501 2019-07-11 stsp goto done;
6459 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6461 818c7501 2019-07-11 stsp goto done;
6463 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6465 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6467 818c7501 2019-07-11 stsp goto done;
6469 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6471 818c7501 2019-07-11 stsp goto done;
6473 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6474 818c7501 2019-07-11 stsp worktree->base_commit_id);
6476 818c7501 2019-07-11 stsp goto done;
6477 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6479 818c7501 2019-07-11 stsp goto done;
6481 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6483 818c7501 2019-07-11 stsp goto done;
6485 818c7501 2019-07-11 stsp free(fileindex_path);
6486 818c7501 2019-07-11 stsp free(tmp_branch_name);
6487 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6488 818c7501 2019-07-11 stsp free(branch_ref_name);
6489 818c7501 2019-07-11 stsp if (branch_ref)
6490 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6491 818c7501 2019-07-11 stsp if (wt_branch)
6492 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6493 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6494 818c7501 2019-07-11 stsp if (err) {
6495 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6496 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6497 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6499 818c7501 2019-07-11 stsp if (*tmp_branch) {
6500 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6501 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6503 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6504 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6505 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6507 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6509 818c7501 2019-07-11 stsp return err;
6512 818c7501 2019-07-11 stsp const struct got_error *
6513 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6514 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6515 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6516 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6518 818c7501 2019-07-11 stsp const struct got_error *err;
6519 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6520 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6521 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6522 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6523 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6525 818c7501 2019-07-11 stsp *commit_id = NULL;
6526 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6527 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6528 3e3a69f1 2019-07-25 stsp *branch = NULL;
6529 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6531 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6533 3e3a69f1 2019-07-25 stsp return err;
6535 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6537 f032f1f7 2019-08-04 stsp goto done;
6539 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6540 f032f1f7 2019-08-04 stsp &have_staged_files);
6541 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6542 f032f1f7 2019-08-04 stsp goto done;
6543 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6544 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6545 3e3a69f1 2019-07-25 stsp goto done;
6548 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6550 f032f1f7 2019-08-04 stsp goto done;
6552 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6554 818c7501 2019-07-11 stsp goto done;
6556 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6558 818c7501 2019-07-11 stsp goto done;
6560 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6562 818c7501 2019-07-11 stsp goto done;
6564 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6566 818c7501 2019-07-11 stsp goto done;
6568 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6569 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6571 818c7501 2019-07-11 stsp goto done;
6573 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6575 818c7501 2019-07-11 stsp goto done;
6577 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6579 818c7501 2019-07-11 stsp goto done;
6581 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6582 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6584 818c7501 2019-07-11 stsp goto done;
6586 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6588 818c7501 2019-07-11 stsp goto done;
6590 818c7501 2019-07-11 stsp free(commit_ref_name);
6591 818c7501 2019-07-11 stsp free(branch_ref_name);
6592 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6593 818c7501 2019-07-11 stsp if (commit_ref)
6594 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6595 818c7501 2019-07-11 stsp if (branch_ref)
6596 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6597 818c7501 2019-07-11 stsp if (err) {
6598 818c7501 2019-07-11 stsp free(*commit_id);
6599 818c7501 2019-07-11 stsp *commit_id = NULL;
6600 818c7501 2019-07-11 stsp if (*tmp_branch) {
6601 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6602 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6604 818c7501 2019-07-11 stsp if (*new_base_branch) {
6605 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6606 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6608 818c7501 2019-07-11 stsp if (*branch) {
6609 818c7501 2019-07-11 stsp got_ref_close(*branch);
6610 818c7501 2019-07-11 stsp *branch = NULL;
6612 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6613 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6614 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6616 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6618 818c7501 2019-07-11 stsp return err;
6621 818c7501 2019-07-11 stsp const struct got_error *
6622 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6624 818c7501 2019-07-11 stsp const struct got_error *err;
6625 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6627 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6629 818c7501 2019-07-11 stsp return err;
6631 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6632 818c7501 2019-07-11 stsp free(tmp_branch_name);
6633 818c7501 2019-07-11 stsp return NULL;
6636 818c7501 2019-07-11 stsp static const struct got_error *
6637 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6638 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
6640 0ebf8283 2019-07-24 stsp *logmsg = arg;
6641 818c7501 2019-07-11 stsp return NULL;
6644 818c7501 2019-07-11 stsp static const struct got_error *
6645 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6646 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6647 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6648 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6650 818c7501 2019-07-11 stsp return NULL;
6653 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6654 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6655 01757395 2019-07-12 stsp void *progress_arg;
6656 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6659 01757395 2019-07-12 stsp static const struct got_error *
6660 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6662 01757395 2019-07-12 stsp const struct got_error *err;
6663 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6665 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6667 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6669 01757395 2019-07-12 stsp return err;
6671 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6672 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6673 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6674 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6675 01757395 2019-07-12 stsp return NULL;
6677 01757395 2019-07-12 stsp p = strdup(path);
6678 01757395 2019-07-12 stsp if (p == NULL)
6679 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6681 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6682 01757395 2019-07-12 stsp if (err || new == NULL)
6684 01757395 2019-07-12 stsp return err;
6687 0ebf8283 2019-07-24 stsp static const struct got_error *
6688 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6689 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6691 818c7501 2019-07-11 stsp const struct got_error *err;
6692 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6694 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6695 818c7501 2019-07-11 stsp if (err) {
6696 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6697 818c7501 2019-07-11 stsp goto done;
6698 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6700 818c7501 2019-07-11 stsp goto done;
6701 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6703 818c7501 2019-07-11 stsp goto done;
6704 de05890f 2020-03-05 stsp } else if (is_rebase) {
6705 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6708 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6710 818c7501 2019-07-11 stsp goto done;
6711 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6712 818c7501 2019-07-11 stsp free(stored_id);
6713 818c7501 2019-07-11 stsp if (cmp != 0) {
6714 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6715 818c7501 2019-07-11 stsp goto done;
6719 0ebf8283 2019-07-24 stsp if (commit_ref)
6720 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6721 0ebf8283 2019-07-24 stsp return err;
6724 0ebf8283 2019-07-24 stsp static const struct got_error *
6725 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6726 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6727 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6728 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6729 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6730 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6732 0ebf8283 2019-07-24 stsp const struct got_error *err;
6733 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6734 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6735 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6737 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6739 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6741 0ebf8283 2019-07-24 stsp return err;
6743 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6744 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6745 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6746 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6747 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6748 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6749 818c7501 2019-07-11 stsp if (commit_ref)
6750 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6751 818c7501 2019-07-11 stsp return err;
6754 818c7501 2019-07-11 stsp const struct got_error *
6755 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6756 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6757 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6758 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6759 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6760 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6762 0ebf8283 2019-07-24 stsp const struct got_error *err;
6763 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6765 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6767 0ebf8283 2019-07-24 stsp return err;
6769 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6771 0ebf8283 2019-07-24 stsp goto done;
6773 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6774 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6775 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6777 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6778 0ebf8283 2019-07-24 stsp return err;
6781 0ebf8283 2019-07-24 stsp const struct got_error *
6782 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6783 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6784 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6785 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6786 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6787 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6789 0ebf8283 2019-07-24 stsp const struct got_error *err;
6790 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6792 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6794 0ebf8283 2019-07-24 stsp return err;
6796 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6798 0ebf8283 2019-07-24 stsp goto done;
6800 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6801 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6802 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6804 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6805 0ebf8283 2019-07-24 stsp return err;
6808 0ebf8283 2019-07-24 stsp static const struct got_error *
6809 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6810 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6811 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6812 598eac43 2022-07-22 stsp struct got_reference *tmp_branch, const char *committer,
6813 598eac43 2022-07-22 stsp struct got_commit_object *orig_commit, const char *new_logmsg,
6814 12383673 2023-02-18 mark int allow_conflict, struct got_repository *repo)
6816 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6817 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6818 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6819 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6820 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6821 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6822 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6824 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6825 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6826 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6828 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6830 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6832 3e3a69f1 2019-07-25 stsp return err;
6834 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6835 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6836 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6837 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6838 12383673 2023-02-18 mark cc_arg.commit_conflicts = allow_conflict;
6840 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6841 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6843 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6844 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6845 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6846 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6847 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6848 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6850 01757395 2019-07-12 stsp if (merged_paths) {
6851 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6852 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6853 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6854 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6857 01757395 2019-07-12 stsp goto done;
6860 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6861 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6863 01757395 2019-07-12 stsp goto done;
6866 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6867 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6868 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6870 a0e95631 2019-07-12 stsp goto done;
6871 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6872 a0e95631 2019-07-12 stsp goto done;
6875 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6877 edd02c5e 2019-07-11 stsp goto done;
6879 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6881 818c7501 2019-07-11 stsp goto done;
6883 5943eee2 2019-08-13 stsp if (new_logmsg) {
6884 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6885 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6886 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6887 5943eee2 2019-08-13 stsp goto done;
6890 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6892 5943eee2 2019-08-13 stsp goto done;
6895 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6896 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6897 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6898 50e7a649 2022-07-22 stsp committer ? committer :
6899 2a47b1e5 2022-11-01 stsp got_object_commit_get_committer(orig_commit), NULL,
6900 50e7a649 2022-07-22 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6902 a0e95631 2019-07-12 stsp goto done;
6904 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6906 a0e95631 2019-07-12 stsp goto done;
6908 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6910 a0e95631 2019-07-12 stsp goto done;
6912 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6913 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6914 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6915 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6916 a0e95631 2019-07-12 stsp err = sync_err;
6918 a0e95631 2019-07-12 stsp free(fileindex_path);
6919 a0e95631 2019-07-12 stsp free(head_commit_id);
6920 a0e95631 2019-07-12 stsp if (head_ref)
6921 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6922 818c7501 2019-07-11 stsp if (err) {
6923 818c7501 2019-07-11 stsp free(*new_commit_id);
6924 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6926 818c7501 2019-07-11 stsp return err;
6929 818c7501 2019-07-11 stsp const struct got_error *
6930 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6931 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6932 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6933 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6934 12383673 2023-02-18 mark struct got_object_id *orig_commit_id, int allow_conflict,
6935 12383673 2023-02-18 mark struct got_repository *repo)
6937 0ebf8283 2019-07-24 stsp const struct got_error *err;
6938 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6939 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6940 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6942 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6944 0ebf8283 2019-07-24 stsp return err;
6946 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6948 0ebf8283 2019-07-24 stsp goto done;
6949 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6951 0ebf8283 2019-07-24 stsp goto done;
6952 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6953 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6954 0ebf8283 2019-07-24 stsp goto done;
6957 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6958 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6959 12383673 2023-02-18 mark NULL, allow_conflict, repo);
6961 0ebf8283 2019-07-24 stsp if (commit_ref)
6962 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6963 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6964 0ebf8283 2019-07-24 stsp free(commit_id);
6965 0ebf8283 2019-07-24 stsp return err;
6968 0ebf8283 2019-07-24 stsp const struct got_error *
6969 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6970 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6971 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6972 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6973 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6974 12383673 2023-02-18 mark int allow_conflict, struct got_repository *repo)
6976 0ebf8283 2019-07-24 stsp const struct got_error *err;
6977 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6978 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6980 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6982 0ebf8283 2019-07-24 stsp return err;
6984 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6986 0ebf8283 2019-07-24 stsp goto done;
6988 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6989 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6990 12383673 2023-02-18 mark new_logmsg, allow_conflict, repo);
6992 0ebf8283 2019-07-24 stsp if (commit_ref)
6993 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6994 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6995 0ebf8283 2019-07-24 stsp return err;
6998 0ebf8283 2019-07-24 stsp const struct got_error *
6999 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
7000 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
7002 3e3a69f1 2019-07-25 stsp if (fileindex)
7003 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
7004 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
7007 69844fba 2019-07-11 stsp static const struct got_error *
7008 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
7010 69844fba 2019-07-11 stsp const struct got_error *err;
7011 69844fba 2019-07-11 stsp struct got_reference *ref;
7013 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
7014 69844fba 2019-07-11 stsp if (err) {
7015 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
7016 69844fba 2019-07-11 stsp return NULL;
7017 69844fba 2019-07-11 stsp return err;
7020 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
7021 69844fba 2019-07-11 stsp got_ref_close(ref);
7022 69844fba 2019-07-11 stsp return err;
7025 69844fba 2019-07-11 stsp static const struct got_error *
7026 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
7028 69844fba 2019-07-11 stsp const struct got_error *err;
7029 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
7030 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7032 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
7034 69844fba 2019-07-11 stsp goto done;
7035 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
7037 69844fba 2019-07-11 stsp goto done;
7039 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
7041 69844fba 2019-07-11 stsp goto done;
7042 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
7044 69844fba 2019-07-11 stsp goto done;
7046 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
7048 69844fba 2019-07-11 stsp goto done;
7049 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
7051 69844fba 2019-07-11 stsp goto done;
7053 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7055 69844fba 2019-07-11 stsp goto done;
7056 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
7058 69844fba 2019-07-11 stsp goto done;
7061 69844fba 2019-07-11 stsp free(tmp_branch_name);
7062 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
7063 69844fba 2019-07-11 stsp free(branch_ref_name);
7064 69844fba 2019-07-11 stsp free(commit_ref_name);
7065 e600f124 2021-03-21 stsp return err;
7068 336075a4 2022-06-25 op static const struct got_error *
7069 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
7070 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
7072 e600f124 2021-03-21 stsp const struct got_error *err;
7073 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
7074 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
7075 e600f124 2021-03-21 stsp const char *branch_name = NULL;
7076 e600f124 2021-03-21 stsp char *new_id_str = NULL;
7077 e600f124 2021-03-21 stsp char *refname = NULL;
7079 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
7080 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
7081 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
7082 e600f124 2021-03-21 stsp branch_name += 11;
7084 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
7086 e600f124 2021-03-21 stsp return err;
7088 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
7089 e600f124 2021-03-21 stsp new_id_str) == -1) {
7090 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
7091 e600f124 2021-03-21 stsp goto done;
7094 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
7096 e600f124 2021-03-21 stsp goto done;
7098 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
7100 e600f124 2021-03-21 stsp goto done;
7102 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
7104 e600f124 2021-03-21 stsp free(new_id_str);
7105 e600f124 2021-03-21 stsp free(refname);
7106 e600f124 2021-03-21 stsp free(old_commit_id);
7108 e600f124 2021-03-21 stsp got_ref_close(ref);
7109 69844fba 2019-07-11 stsp return err;
7112 818c7501 2019-07-11 stsp const struct got_error *
7113 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
7114 ef85a376 2023-02-01 mark struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7115 ef85a376 2023-02-01 mark struct got_reference *rebased_branch, struct got_repository *repo,
7116 ef85a376 2023-02-01 mark int create_backup)
7118 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7119 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
7120 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7122 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7124 818c7501 2019-07-11 stsp return err;
7126 e600f124 2021-03-21 stsp if (create_backup) {
7127 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7128 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
7130 e600f124 2021-03-21 stsp goto done;
7133 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7135 818c7501 2019-07-11 stsp goto done;
7137 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
7139 818c7501 2019-07-11 stsp goto done;
7141 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
7143 818c7501 2019-07-11 stsp goto done;
7145 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
7147 a615e0e7 2020-12-16 stsp goto done;
7149 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7151 a615e0e7 2020-12-16 stsp goto done;
7152 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7153 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7154 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7155 a615e0e7 2020-12-16 stsp err = sync_err;
7157 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7158 a615e0e7 2020-12-16 stsp free(fileindex_path);
7159 818c7501 2019-07-11 stsp free(new_head_commit_id);
7160 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7161 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7162 818c7501 2019-07-11 stsp err = unlockerr;
7163 818c7501 2019-07-11 stsp return err;
7166 818c7501 2019-07-11 stsp const struct got_error *
7167 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
7168 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7169 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
7170 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
7172 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
7173 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
7174 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
7175 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7176 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
7177 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7178 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
7180 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
7182 818c7501 2019-07-11 stsp return err;
7184 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7185 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7187 a44927cc 2022-04-07 stsp goto done;
7189 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
7190 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
7192 818c7501 2019-07-11 stsp goto done;
7194 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
7196 818c7501 2019-07-11 stsp goto done;
7199 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
7200 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
7201 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
7203 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
7205 818c7501 2019-07-11 stsp goto done;
7207 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7209 818c7501 2019-07-11 stsp goto done;
7211 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7212 a44927cc 2022-04-07 stsp worktree->path_prefix);
7214 ca355955 2019-07-12 stsp goto done;
7216 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
7218 ca355955 2019-07-12 stsp goto done;
7220 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7222 818c7501 2019-07-11 stsp goto done;
7224 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7225 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7226 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7227 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7228 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7229 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7230 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7231 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7232 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
7233 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7235 1f1abb7e 2019-08-08 stsp goto sync;
7237 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7238 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
7240 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7241 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
7242 ca355955 2019-07-12 stsp err = sync_err;
7244 818c7501 2019-07-11 stsp got_ref_close(resolved);
7245 a3a2faf2 2019-07-12 stsp free(tree_id);
7246 818c7501 2019-07-11 stsp free(commit_id);
7247 a44927cc 2022-04-07 stsp if (commit)
7248 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7249 0ebf8283 2019-07-24 stsp if (fileindex)
7250 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
7251 0ebf8283 2019-07-24 stsp free(fileindex_path);
7253 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7254 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7255 0ebf8283 2019-07-24 stsp err = unlockerr;
7256 0ebf8283 2019-07-24 stsp return err;
7259 0ebf8283 2019-07-24 stsp const struct got_error *
7260 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7261 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7262 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7263 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7265 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7266 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7267 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
7268 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
7269 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7270 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
7271 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
7272 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7274 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7275 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7276 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7277 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7279 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7281 0ebf8283 2019-07-24 stsp return err;
7283 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7285 0ebf8283 2019-07-24 stsp goto done;
7287 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
7288 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
7289 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7292 0ebf8283 2019-07-24 stsp goto done;
7294 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7296 0ebf8283 2019-07-24 stsp goto done;
7298 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7300 0ebf8283 2019-07-24 stsp goto done;
7302 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7303 0ebf8283 2019-07-24 stsp worktree);
7305 0ebf8283 2019-07-24 stsp goto done;
7307 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7310 0ebf8283 2019-07-24 stsp goto done;
7312 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7314 0ebf8283 2019-07-24 stsp goto done;
7316 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
7318 0ebf8283 2019-07-24 stsp goto done;
7320 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7321 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7323 0ebf8283 2019-07-24 stsp goto done;
7324 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
7326 0ebf8283 2019-07-24 stsp goto done;
7327 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7328 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
7329 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
7330 0ebf8283 2019-07-24 stsp goto done;
7333 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
7334 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7336 0ebf8283 2019-07-24 stsp goto done;
7337 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
7339 0ebf8283 2019-07-24 stsp goto done;
7341 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
7343 0ebf8283 2019-07-24 stsp goto done;
7345 0ebf8283 2019-07-24 stsp free(fileindex_path);
7346 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7347 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7348 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7349 0ebf8283 2019-07-24 stsp if (wt_branch)
7350 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
7351 0ebf8283 2019-07-24 stsp if (err) {
7352 0ebf8283 2019-07-24 stsp if (*branch_ref) {
7353 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
7354 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7356 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7357 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7358 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7360 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7361 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7362 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7363 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7365 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
7367 0ebf8283 2019-07-24 stsp return err;
7370 0ebf8283 2019-07-24 stsp const struct got_error *
7371 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
7372 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
7374 3e3a69f1 2019-07-25 stsp if (fileindex)
7375 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
7376 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
7379 0ebf8283 2019-07-24 stsp const struct got_error *
7380 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
7381 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
7383 0ebf8283 2019-07-24 stsp const struct got_error *err;
7384 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7386 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7388 0ebf8283 2019-07-24 stsp return err;
7390 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7391 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7392 0ebf8283 2019-07-24 stsp return NULL;
7395 0ebf8283 2019-07-24 stsp const struct got_error *
7396 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
7397 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
7398 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7399 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7401 0ebf8283 2019-07-24 stsp const struct got_error *err;
7402 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7403 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7404 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
7405 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7406 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
7407 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
7409 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7410 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7411 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7412 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7414 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7416 3e3a69f1 2019-07-25 stsp return err;
7418 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7420 f032f1f7 2019-08-04 stsp goto done;
7422 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7423 f032f1f7 2019-08-04 stsp &have_staged_files);
7424 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7425 f032f1f7 2019-08-04 stsp goto done;
7426 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7427 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7428 3e3a69f1 2019-07-25 stsp goto done;
7431 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7433 f032f1f7 2019-08-04 stsp goto done;
7435 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7437 0ebf8283 2019-07-24 stsp goto done;
7439 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7441 0ebf8283 2019-07-24 stsp goto done;
7443 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7444 0ebf8283 2019-07-24 stsp worktree);
7446 0ebf8283 2019-07-24 stsp goto done;
7448 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7450 0ebf8283 2019-07-24 stsp goto done;
7452 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7454 0ebf8283 2019-07-24 stsp goto done;
7455 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7457 0ebf8283 2019-07-24 stsp goto done;
7459 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7461 0ebf8283 2019-07-24 stsp goto done;
7462 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7464 0ebf8283 2019-07-24 stsp goto done;
7466 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7468 0ebf8283 2019-07-24 stsp goto done;
7470 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7471 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7472 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7473 0ebf8283 2019-07-24 stsp if (commit_ref)
7474 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7475 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7476 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7477 0ebf8283 2019-07-24 stsp if (err) {
7478 0ebf8283 2019-07-24 stsp free(*commit_id);
7479 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7480 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7481 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7482 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7483 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7484 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7486 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7487 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7488 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7490 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7492 0ebf8283 2019-07-24 stsp return err;
7495 0ebf8283 2019-07-24 stsp static const struct got_error *
7496 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7498 0ebf8283 2019-07-24 stsp const struct got_error *err;
7499 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7500 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7502 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7504 0ebf8283 2019-07-24 stsp goto done;
7505 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7507 0ebf8283 2019-07-24 stsp goto done;
7509 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7510 0ebf8283 2019-07-24 stsp worktree);
7512 0ebf8283 2019-07-24 stsp goto done;
7513 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7515 0ebf8283 2019-07-24 stsp goto done;
7517 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7519 0ebf8283 2019-07-24 stsp goto done;
7520 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7522 0ebf8283 2019-07-24 stsp goto done;
7524 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7526 0ebf8283 2019-07-24 stsp goto done;
7527 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7529 0ebf8283 2019-07-24 stsp goto done;
7531 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7532 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7533 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7534 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7535 0ebf8283 2019-07-24 stsp return err;
7538 0ebf8283 2019-07-24 stsp const struct got_error *
7539 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7540 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7541 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7542 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7544 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7545 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7546 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7547 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7548 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7549 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7551 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7553 0ebf8283 2019-07-24 stsp return err;
7555 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7556 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7558 a44927cc 2022-04-07 stsp goto done;
7560 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7561 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7563 0ebf8283 2019-07-24 stsp goto done;
7565 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7567 0ebf8283 2019-07-24 stsp goto done;
7569 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7571 0ebf8283 2019-07-24 stsp goto done;
7573 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7574 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7576 0ebf8283 2019-07-24 stsp goto done;
7578 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7580 0ebf8283 2019-07-24 stsp goto done;
7582 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7584 0ebf8283 2019-07-24 stsp goto done;
7586 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7587 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7588 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7589 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7590 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7591 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7592 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7593 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7594 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7595 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7597 1f1abb7e 2019-08-08 stsp goto sync;
7599 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7600 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7602 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7603 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7604 0ebf8283 2019-07-24 stsp err = sync_err;
7606 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7607 0ebf8283 2019-07-24 stsp free(tree_id);
7608 818c7501 2019-07-11 stsp free(fileindex_path);
7610 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7611 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7612 818c7501 2019-07-11 stsp err = unlockerr;
7613 818c7501 2019-07-11 stsp return err;
7616 0ebf8283 2019-07-24 stsp const struct got_error *
7617 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7618 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7619 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7621 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7622 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7623 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7624 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7626 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7628 0ebf8283 2019-07-24 stsp return err;
7630 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7631 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7633 e600f124 2021-03-21 stsp goto done;
7635 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7636 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7638 0ebf8283 2019-07-24 stsp goto done;
7640 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7642 0ebf8283 2019-07-24 stsp goto done;
7644 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7646 0ebf8283 2019-07-24 stsp goto done;
7648 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7650 0ebf8283 2019-07-24 stsp goto done;
7652 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7654 a615e0e7 2020-12-16 stsp goto done;
7656 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7658 a615e0e7 2020-12-16 stsp goto done;
7659 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7660 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7661 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7662 a615e0e7 2020-12-16 stsp err = sync_err;
7664 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7665 a615e0e7 2020-12-16 stsp free(fileindex_path);
7666 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7667 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7668 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7669 0ebf8283 2019-07-24 stsp err = unlockerr;
7670 0ebf8283 2019-07-24 stsp return err;
7673 0ebf8283 2019-07-24 stsp const struct got_error *
7674 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7675 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7677 0ebf8283 2019-07-24 stsp const struct got_error *err;
7678 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7680 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7682 0ebf8283 2019-07-24 stsp return err;
7684 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7686 0ebf8283 2019-07-24 stsp goto done;
7688 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7690 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7691 2822a352 2019-10-15 stsp return err;
7694 2822a352 2019-10-15 stsp const struct got_error *
7695 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7696 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7697 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7698 2822a352 2019-10-15 stsp struct got_repository *repo)
7700 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7701 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7702 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7704 2822a352 2019-10-15 stsp *fileindex = NULL;
7705 2822a352 2019-10-15 stsp *branch_ref = NULL;
7706 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7708 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7710 2822a352 2019-10-15 stsp return err;
7712 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7713 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7714 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7715 2822a352 2019-10-15 stsp "update -b or different branch name required");
7716 2822a352 2019-10-15 stsp goto done;
7719 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7721 2822a352 2019-10-15 stsp goto done;
7723 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7724 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7725 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7726 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7729 2822a352 2019-10-15 stsp goto done;
7731 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7733 2822a352 2019-10-15 stsp goto done;
7735 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7736 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7738 2822a352 2019-10-15 stsp if (err) {
7739 2822a352 2019-10-15 stsp if (*branch_ref) {
7740 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7741 2822a352 2019-10-15 stsp *branch_ref = NULL;
7743 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7744 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7745 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7747 2822a352 2019-10-15 stsp if (*fileindex) {
7748 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7749 2822a352 2019-10-15 stsp *fileindex = NULL;
7751 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7753 0cb83759 2019-08-03 stsp return err;
7756 2822a352 2019-10-15 stsp const struct got_error *
7757 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7758 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7759 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7760 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7761 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7763 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7764 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7765 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7766 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7768 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7770 2822a352 2019-10-15 stsp goto done;
7772 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7774 2822a352 2019-10-15 stsp goto done;
7776 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7778 a44927cc 2022-04-07 stsp goto done;
7780 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7781 2822a352 2019-10-15 stsp worktree->path_prefix);
7783 2822a352 2019-10-15 stsp goto done;
7785 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7787 2822a352 2019-10-15 stsp goto done;
7789 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7790 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7792 2822a352 2019-10-15 stsp goto sync;
7794 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7796 2822a352 2019-10-15 stsp goto sync;
7798 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7800 6e210706 2021-01-22 stsp goto sync;
7802 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7804 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7805 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7806 2822a352 2019-10-15 stsp err = sync_err;
7809 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7810 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7811 2822a352 2019-10-15 stsp err = unlockerr;
7812 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7814 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7815 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7816 2822a352 2019-10-15 stsp err = unlockerr;
7817 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7819 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7820 2822a352 2019-10-15 stsp free(fileindex_path);
7821 2822a352 2019-10-15 stsp free(tree_id);
7822 a44927cc 2022-04-07 stsp if (commit)
7823 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7825 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7826 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7827 2822a352 2019-10-15 stsp err = unlockerr;
7828 2822a352 2019-10-15 stsp return err;
7831 2822a352 2019-10-15 stsp const struct got_error *
7832 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7833 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7834 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7836 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7838 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7840 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7842 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7843 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7844 8b692cd0 2019-10-21 stsp err = unlockerr;
7845 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7847 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7848 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7849 8b692cd0 2019-10-21 stsp err = unlockerr;
7850 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7852 f259c4c1 2021-09-24 stsp return err;
7855 f259c4c1 2021-09-24 stsp const struct got_error *
7856 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7857 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7859 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7860 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7862 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7864 f259c4c1 2021-09-24 stsp goto done;
7866 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7868 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7869 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7870 f259c4c1 2021-09-24 stsp err = sync_err;
7872 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7873 f259c4c1 2021-09-24 stsp free(fileindex_path);
7874 8b692cd0 2019-10-21 stsp return err;
7877 f259c4c1 2021-09-24 stsp static const struct got_error *
7878 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7880 f259c4c1 2021-09-24 stsp const struct got_error *err;
7881 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7883 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7885 f259c4c1 2021-09-24 stsp goto done;
7886 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7888 f259c4c1 2021-09-24 stsp goto done;
7890 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7892 f259c4c1 2021-09-24 stsp goto done;
7893 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7895 f259c4c1 2021-09-24 stsp goto done;
7898 f259c4c1 2021-09-24 stsp free(branch_refname);
7899 f259c4c1 2021-09-24 stsp free(commit_refname);
7900 f259c4c1 2021-09-24 stsp return err;
7903 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7904 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7905 f259c4c1 2021-09-24 stsp const char *branch_name;
7908 f259c4c1 2021-09-24 stsp static const struct got_error *
7909 2a47b1e5 2022-11-01 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7910 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
7912 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7914 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7915 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7916 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7918 f259c4c1 2021-09-24 stsp return NULL;
7922 f259c4c1 2021-09-24 stsp const struct got_error *
7923 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7924 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7925 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7926 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7927 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7928 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7930 f259c4c1 2021-09-24 stsp const struct got_error *err;
7931 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7933 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7935 f259c4c1 2021-09-24 stsp goto done;
7937 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7938 f259c4c1 2021-09-24 stsp worktree);
7940 f259c4c1 2021-09-24 stsp goto done;
7942 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7943 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7944 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7946 f259c4c1 2021-09-24 stsp free(fileindex_path);
7947 f259c4c1 2021-09-24 stsp return err;
7950 f259c4c1 2021-09-24 stsp const struct got_error *
7951 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7952 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7953 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7954 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7955 12383673 2023-02-18 mark int allow_conflict, struct got_repository *repo,
7956 0ff8d236 2021-09-28 stsp got_worktree_status_cb status_cb, void *status_arg)
7959 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7960 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7961 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7962 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7963 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7964 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7965 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7966 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7967 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7969 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
7970 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7972 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7974 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7976 f259c4c1 2021-09-24 stsp goto done;
7978 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7980 f259c4c1 2021-09-24 stsp goto done;
7982 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7984 f259c4c1 2021-09-24 stsp goto done;
7986 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7987 f259c4c1 2021-09-24 stsp &have_staged_files);
7988 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7989 f259c4c1 2021-09-24 stsp goto done;
7990 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7991 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7992 f259c4c1 2021-09-24 stsp goto done;
7995 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7996 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7997 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7998 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7999 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
8000 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
8001 12383673 2023-02-18 mark cc_arg.commit_conflicts = allow_conflict;
8002 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
8003 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
8005 f259c4c1 2021-09-24 stsp goto done;
8007 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
8008 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
8009 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
8010 f259c4c1 2021-09-24 stsp goto done;
8013 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
8014 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
8015 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
8017 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
8018 f259c4c1 2021-09-24 stsp ct_path++;
8019 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
8020 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
8021 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
8023 f259c4c1 2021-09-24 stsp goto done;
8027 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
8028 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
8029 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
8030 2a47b1e5 2022-11-01 stsp head_commit_id, branch_tip, worktree, author, committer, NULL,
8031 0ff8d236 2021-09-28 stsp merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
8033 f259c4c1 2021-09-24 stsp goto done;
8035 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
8036 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
8037 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8038 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8039 f259c4c1 2021-09-24 stsp err = sync_err;
8041 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
8042 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
8044 f259c4c1 2021-09-24 stsp free_commitable(ct);
8046 d8bacb93 2023-01-10 mark got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
8047 f259c4c1 2021-09-24 stsp free(fileindex_path);
8048 f259c4c1 2021-09-24 stsp return err;
8051 f259c4c1 2021-09-24 stsp const struct got_error *
8052 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
8053 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
8055 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
8056 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8058 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
8060 f259c4c1 2021-09-24 stsp goto done;
8062 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
8064 f259c4c1 2021-09-24 stsp goto done;
8065 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8066 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8067 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8068 f259c4c1 2021-09-24 stsp err = sync_err;
8070 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
8071 f259c4c1 2021-09-24 stsp free(fileindex_path);
8072 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8073 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
8074 f259c4c1 2021-09-24 stsp err = unlockerr;
8075 f259c4c1 2021-09-24 stsp return err;
8078 f259c4c1 2021-09-24 stsp const struct got_error *
8079 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
8080 f259c4c1 2021-09-24 stsp struct got_repository *repo)
8082 f259c4c1 2021-09-24 stsp const struct got_error *err;
8083 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
8084 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
8086 f259c4c1 2021-09-24 stsp *in_progress = 0;
8088 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8090 f259c4c1 2021-09-24 stsp return err;
8091 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8092 793fcac3 2021-09-24 stsp free(branch_refname);
8093 f259c4c1 2021-09-24 stsp if (err) {
8094 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
8095 f259c4c1 2021-09-24 stsp return err;
8097 f259c4c1 2021-09-24 stsp *in_progress = 1;
8099 f259c4c1 2021-09-24 stsp return NULL;
8102 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
8103 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
8104 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
8106 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
8107 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8108 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
8109 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8110 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
8111 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8112 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
8114 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8116 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8118 f259c4c1 2021-09-24 stsp return err;
8120 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8122 f259c4c1 2021-09-24 stsp goto done;
8124 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
8125 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
8126 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
8127 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8130 f259c4c1 2021-09-24 stsp goto done;
8132 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8134 f259c4c1 2021-09-24 stsp return err;
8136 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8138 f259c4c1 2021-09-24 stsp return err;
8140 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8143 f259c4c1 2021-09-24 stsp goto done;
8145 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8147 f259c4c1 2021-09-24 stsp goto done;
8149 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8150 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8151 f259c4c1 2021-09-24 stsp goto done;
8154 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
8156 f259c4c1 2021-09-24 stsp goto done;
8158 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8160 f259c4c1 2021-09-24 stsp goto done;
8161 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
8163 f259c4c1 2021-09-24 stsp goto done;
8165 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8167 f259c4c1 2021-09-24 stsp goto done;
8168 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
8170 f259c4c1 2021-09-24 stsp goto done;
8173 f259c4c1 2021-09-24 stsp free(branch_refname);
8174 f259c4c1 2021-09-24 stsp free(commit_refname);
8175 f259c4c1 2021-09-24 stsp free(fileindex_path);
8176 f259c4c1 2021-09-24 stsp if (branch_ref)
8177 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8178 f259c4c1 2021-09-24 stsp if (commit_ref)
8179 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8180 f259c4c1 2021-09-24 stsp if (wt_branch)
8181 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
8182 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
8183 f259c4c1 2021-09-24 stsp if (err) {
8184 f259c4c1 2021-09-24 stsp if (*fileindex) {
8185 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8186 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8188 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8190 f259c4c1 2021-09-24 stsp return err;
8193 f259c4c1 2021-09-24 stsp const struct got_error *
8194 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
8195 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8196 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8198 f259c4c1 2021-09-24 stsp const struct got_error *err;
8199 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
8200 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8201 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8202 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
8204 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8205 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8206 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8208 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8210 f259c4c1 2021-09-24 stsp return err;
8212 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8214 f259c4c1 2021-09-24 stsp goto done;
8216 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8217 f259c4c1 2021-09-24 stsp &have_staged_files);
8218 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
8219 f259c4c1 2021-09-24 stsp goto done;
8220 f259c4c1 2021-09-24 stsp if (have_staged_files) {
8221 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
8222 f259c4c1 2021-09-24 stsp goto done;
8225 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8227 f259c4c1 2021-09-24 stsp goto done;
8229 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8231 f259c4c1 2021-09-24 stsp goto done;
8233 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8235 f259c4c1 2021-09-24 stsp goto done;
8237 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
8238 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8239 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
8240 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
8241 f259c4c1 2021-09-24 stsp goto done;
8243 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8244 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
8245 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
8246 f259c4c1 2021-09-24 stsp goto done;
8249 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8251 f259c4c1 2021-09-24 stsp goto done;
8253 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
8255 f259c4c1 2021-09-24 stsp goto done;
8257 f259c4c1 2021-09-24 stsp free(commit_refname);
8258 f259c4c1 2021-09-24 stsp free(branch_refname);
8259 f259c4c1 2021-09-24 stsp free(fileindex_path);
8260 f259c4c1 2021-09-24 stsp if (commit_ref)
8261 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8262 f259c4c1 2021-09-24 stsp if (branch_ref)
8263 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8264 f259c4c1 2021-09-24 stsp if (err) {
8265 f259c4c1 2021-09-24 stsp if (*branch_name) {
8266 f259c4c1 2021-09-24 stsp free(*branch_name);
8267 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8269 f259c4c1 2021-09-24 stsp free(*branch_tip);
8270 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8271 f259c4c1 2021-09-24 stsp if (*fileindex) {
8272 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8273 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8275 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8277 f259c4c1 2021-09-24 stsp return err;
8280 f259c4c1 2021-09-24 stsp const struct got_error *
8281 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
8282 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
8283 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8285 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
8286 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
8287 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
8288 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8289 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
8290 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
8292 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
8293 a44927cc 2022-04-07 stsp worktree->base_commit_id);
8295 a44927cc 2022-04-07 stsp goto done;
8297 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
8298 a44927cc 2022-04-07 stsp worktree->path_prefix);
8300 f259c4c1 2021-09-24 stsp goto done;
8302 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
8304 f259c4c1 2021-09-24 stsp goto done;
8306 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
8308 f259c4c1 2021-09-24 stsp goto done;
8310 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
8311 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
8312 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
8313 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
8314 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
8315 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
8316 f259c4c1 2021-09-24 stsp rfa.repo = repo;
8317 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
8318 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
8319 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
8321 f259c4c1 2021-09-24 stsp goto sync;
8323 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8324 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
8326 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8327 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8328 f259c4c1 2021-09-24 stsp err = sync_err;
8330 f259c4c1 2021-09-24 stsp free(tree_id);
8331 f259c4c1 2021-09-24 stsp free(commit_id);
8332 a44927cc 2022-04-07 stsp if (commit)
8333 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
8334 f259c4c1 2021-09-24 stsp if (fileindex)
8335 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
8336 f259c4c1 2021-09-24 stsp free(fileindex_path);
8338 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8339 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
8340 f259c4c1 2021-09-24 stsp err = unlockerr;
8341 f259c4c1 2021-09-24 stsp return err;
8344 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
8345 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
8346 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8347 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8348 2db2652d 2019-08-07 stsp struct got_repository *repo;
8349 2db2652d 2019-08-07 stsp int have_changes;
8352 336075a4 2022-06-25 op static const struct got_error *
8353 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
8354 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8355 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8356 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8358 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
8359 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
8360 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
8361 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
8362 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
8363 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
8365 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
8366 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
8367 8b13ce36 2019-08-08 stsp return NULL;
8368 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
8369 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
8371 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8372 735ef5ac 2019-08-03 stsp if (ie == NULL)
8373 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8375 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8376 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8377 735ef5ac 2019-08-03 stsp relpath) == -1)
8378 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
8380 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
8381 b4b2adf5 2023-02-09 op base_commit_idp = got_fileindex_entry_get_commit_id(
8382 b4b2adf5 2023-02-09 op &base_commit_id, ie);
8385 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
8386 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8387 3aa5969e 2019-08-06 stsp goto done;
8388 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
8389 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
8390 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
8391 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8392 735ef5ac 2019-08-03 stsp goto done;
8395 2db2652d 2019-08-07 stsp a->have_changes = 1;
8397 735ef5ac 2019-08-03 stsp p = in_repo_path;
8398 735ef5ac 2019-08-03 stsp while (p[0] == '/')
8400 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
8401 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
8402 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
8404 735ef5ac 2019-08-03 stsp free(in_repo_path);
8405 dc424a06 2019-08-07 stsp return err;
8408 2db2652d 2019-08-07 stsp struct stage_path_arg {
8409 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8410 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8411 2db2652d 2019-08-07 stsp struct got_repository *repo;
8412 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
8413 2db2652d 2019-08-07 stsp void *status_arg;
8414 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
8415 2db2652d 2019-08-07 stsp void *patch_arg;
8416 7b5dc508 2019-10-28 stsp int staged_something;
8417 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
8420 2db2652d 2019-08-07 stsp static const struct got_error *
8421 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
8422 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8423 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8424 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8426 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8427 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8428 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8429 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8430 0cb83759 2019-08-03 stsp uint32_t stage;
8431 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8432 0aeb8099 2020-07-23 stsp struct stat sb;
8434 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8435 8b13ce36 2019-08-08 stsp return NULL;
8437 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8438 d3e7c587 2019-08-03 stsp if (ie == NULL)
8439 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8441 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8442 2db2652d 2019-08-07 stsp relpath)== -1)
8443 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8445 0cb83759 2019-08-03 stsp switch (status) {
8446 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8447 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8448 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8449 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8450 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8453 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8454 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8455 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8456 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8457 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8460 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8463 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8464 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8465 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8466 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8467 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8471 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8472 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8475 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8476 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8477 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8478 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8480 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8481 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8482 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8483 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8484 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8485 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8486 35213c7c 2020-07-23 stsp ssize_t target_len;
8487 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8488 35213c7c 2020-07-23 stsp sizeof(target_path));
8489 35213c7c 2020-07-23 stsp if (target_len == -1) {
8490 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8491 35213c7c 2020-07-23 stsp ondisk_path);
8494 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8495 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8496 35213c7c 2020-07-23 stsp a->worktree->root_path);
8499 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8500 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8501 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8505 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8506 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8507 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8509 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8510 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8512 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8513 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8515 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8516 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8518 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8519 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8520 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8524 9fdde394 2022-06-04 op * When staging the reverse of the staged diff,
8525 9fdde394 2022-06-04 op * implicitly unstage the file.
8527 9fdde394 2022-06-04 op if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8528 9fdde394 2022-06-04 op sizeof(ie->blob_sha1)) == 0) {
8529 9fdde394 2022-06-04 op got_fileindex_entry_stage_set(ie,
8530 9fdde394 2022-06-04 op GOT_FILEIDX_STAGE_NONE);
8533 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8534 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8536 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8537 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8538 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8539 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8542 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8544 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8545 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8549 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8550 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8551 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8552 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8554 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8555 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8558 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8560 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8561 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8563 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8564 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8567 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8571 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8572 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8573 dc424a06 2019-08-07 stsp free(path_content);
8574 2db2652d 2019-08-07 stsp free(ondisk_path);
8575 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8576 0ebf8283 2019-07-24 stsp return err;
8579 0cb83759 2019-08-03 stsp const struct got_error *
8580 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8581 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8582 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8583 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8584 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8586 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8587 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8588 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8589 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8590 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8591 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8592 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8593 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8595 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8597 0cb83759 2019-08-03 stsp return err;
8599 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8600 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8602 735ef5ac 2019-08-03 stsp goto done;
8603 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8605 735ef5ac 2019-08-03 stsp goto done;
8606 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8608 0cb83759 2019-08-03 stsp goto done;
8610 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8611 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8612 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8613 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8614 2db2652d 2019-08-07 stsp oka.repo = repo;
8615 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8616 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8617 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8618 62da3196 2021-10-01 stsp check_stage_ok, &oka, NULL, NULL, 1, 0);
8620 735ef5ac 2019-08-03 stsp goto done;
8622 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8623 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8624 2db2652d 2019-08-07 stsp goto done;
8627 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8628 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8629 2db2652d 2019-08-07 stsp spa.repo = repo;
8630 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8631 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8632 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8633 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8634 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8635 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8636 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8637 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8638 62da3196 2021-10-01 stsp stage_path, &spa, NULL, NULL, 1, 0);
8640 2db2652d 2019-08-07 stsp goto done;
8642 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8643 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8644 7b5dc508 2019-10-28 stsp goto done;
8647 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8648 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8649 0cb83759 2019-08-03 stsp err = sync_err;
8651 735ef5ac 2019-08-03 stsp if (head_ref)
8652 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8653 735ef5ac 2019-08-03 stsp free(head_commit_id);
8654 0cb83759 2019-08-03 stsp free(fileindex_path);
8655 0cb83759 2019-08-03 stsp if (fileindex)
8656 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8657 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8658 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8659 0cb83759 2019-08-03 stsp err = unlockerr;
8660 0cb83759 2019-08-03 stsp return err;
8663 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8664 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8665 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8666 ad493afc 2019-08-03 stsp struct got_repository *repo;
8667 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8668 ad493afc 2019-08-03 stsp void *progress_arg;
8669 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8670 2e1f37b0 2019-08-08 stsp void *patch_arg;
8673 2e1f37b0 2019-08-08 stsp static const struct got_error *
8674 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8675 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8676 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8677 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8678 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8680 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8681 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8682 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8683 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8684 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8685 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8686 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8687 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8689 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8690 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8692 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8694 2e1f37b0 2019-08-08 stsp return err;
8696 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
8697 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
8698 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8699 eb81bc23 2022-06-28 tracey goto done;
8701 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
8702 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
8703 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8704 eb81bc23 2022-06-28 tracey goto done;
8707 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8709 2e1f37b0 2019-08-08 stsp goto done;
8711 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8713 2e1f37b0 2019-08-08 stsp goto done;
8715 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8717 2e1f37b0 2019-08-08 stsp goto done;
8719 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8722 2e1f37b0 2019-08-08 stsp goto done;
8724 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8726 2e1f37b0 2019-08-08 stsp goto done;
8728 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8730 2e1f37b0 2019-08-08 stsp goto done;
8732 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8733 4b752015 2022-06-30 stsp path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8735 2e1f37b0 2019-08-08 stsp goto done;
8737 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8738 b90054ed 2022-11-01 stsp "got-unstaged-content", "");
8740 2e1f37b0 2019-08-08 stsp goto done;
8741 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8742 b90054ed 2022-11-01 stsp "got-new-staged-content", "");
8744 2e1f37b0 2019-08-08 stsp goto done;
8746 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8747 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8748 2e1f37b0 2019-08-08 stsp goto done;
8750 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8751 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8752 2e1f37b0 2019-08-08 stsp goto done;
8754 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8755 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8756 eb81bc23 2022-06-28 tracey struct diff_chunk_context cc = {};
8757 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8758 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8759 fe621944 2020-11-10 stsp nchanges++;
8761 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8762 2e1f37b0 2019-08-08 stsp int choice;
8763 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8764 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8765 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8766 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8768 2e1f37b0 2019-08-08 stsp goto done;
8769 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8770 2e1f37b0 2019-08-08 stsp have_content = 1;
8772 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8773 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8776 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8777 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8778 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8780 2e1f37b0 2019-08-08 stsp free(label1);
8781 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8782 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8784 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8785 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8786 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8787 2e1f37b0 2019-08-08 stsp if (staged_blob)
8788 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8789 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8790 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8791 fe621944 2020-11-10 stsp err = free_err;
8792 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8793 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8794 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8795 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8796 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8797 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8798 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8799 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8800 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8801 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8802 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8803 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8804 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8805 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8806 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8807 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8808 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8809 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8810 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8812 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8813 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8814 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8815 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8816 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8817 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8818 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8820 2e1f37b0 2019-08-08 stsp free(path1);
8821 2e1f37b0 2019-08-08 stsp free(path2);
8822 fda8017d 2020-07-23 stsp return err;
8825 fda8017d 2020-07-23 stsp static const struct got_error *
8826 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8827 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8828 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8829 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8830 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8831 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8832 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8834 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8835 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8836 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8837 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8838 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8839 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8840 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8841 fda8017d 2020-07-23 stsp struct stat sb;
8843 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8844 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8845 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8847 fda8017d 2020-07-23 stsp return err;
8849 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8850 fda8017d 2020-07-23 stsp return NULL;
8852 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8853 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8854 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8856 fda8017d 2020-07-23 stsp goto done;
8859 00fe21f2 2021-12-31 stsp f = fopen(path_unstaged_content, "re");
8860 fda8017d 2020-07-23 stsp if (f == NULL) {
8861 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8862 fda8017d 2020-07-23 stsp path_unstaged_content);
8863 fda8017d 2020-07-23 stsp goto done;
8865 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8866 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8867 fda8017d 2020-07-23 stsp goto done;
8869 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8870 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8871 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8873 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8874 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8875 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8876 fda8017d 2020-07-23 stsp goto done;
8878 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8879 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8880 fda8017d 2020-07-23 stsp goto done;
8882 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8883 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8884 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8885 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8886 fda8017d 2020-07-23 stsp progress_arg);
8888 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8890 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8892 67a66647 2021-05-31 stsp return err;
8894 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8895 67a66647 2021-05-31 stsp parent) == -1) {
8896 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8897 67a66647 2021-05-31 stsp base_path = NULL;
8898 67a66647 2021-05-31 stsp goto done;
8901 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_base_path, &f_base,
8902 b90054ed 2022-11-01 stsp base_path, "");
8904 67a66647 2021-05-31 stsp goto done;
8905 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8906 67a66647 2021-05-31 stsp blob_base);
8908 67a66647 2021-05-31 stsp goto done;
8911 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8912 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8914 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8915 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8916 eec2f5a9 2021-06-03 stsp ondisk_path);
8918 eec2f5a9 2021-06-03 stsp goto done;
8921 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path,
8922 8bd0cdad 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8923 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8924 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8925 eec2f5a9 2021-06-03 stsp goto done;
8927 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8928 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8929 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8930 eec2f5a9 2021-06-03 stsp close(fd);
8931 eec2f5a9 2021-06-03 stsp goto done;
8935 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8936 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8937 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8938 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8939 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8942 fda8017d 2020-07-23 stsp goto done;
8944 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8945 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8946 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8948 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8949 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8952 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8953 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8954 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8955 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8956 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8957 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8958 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8959 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8960 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8961 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8962 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8963 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8964 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8965 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8966 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8967 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8968 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8969 67a66647 2021-05-31 stsp free(blob_base_path);
8970 67a66647 2021-05-31 stsp free(parent);
8971 67a66647 2021-05-31 stsp free(base_path);
8972 2e1f37b0 2019-08-08 stsp return err;
8975 ad493afc 2019-08-03 stsp static const struct got_error *
8976 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8977 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8978 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8979 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8981 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8982 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8983 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8984 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8985 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8986 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8987 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8988 9bc94a15 2019-08-03 stsp struct stat sb;
8989 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8991 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8992 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8993 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8994 2e1f37b0 2019-08-08 stsp return NULL;
8996 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8997 ad493afc 2019-08-03 stsp if (ie == NULL)
8998 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
9000 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
9002 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
9004 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
9005 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
9007 f69721c3 2019-10-21 stsp goto done;
9008 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
9009 f69721c3 2019-10-21 stsp id_str) == -1) {
9010 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
9011 eb81bc23 2022-06-28 tracey goto done;
9014 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
9015 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
9016 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
9017 eb81bc23 2022-06-28 tracey goto done;
9019 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
9020 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
9021 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
9022 f69721c3 2019-10-21 stsp goto done;
9025 ad493afc 2019-08-03 stsp switch (staged_status) {
9026 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
9027 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
9028 eb81bc23 2022-06-28 tracey blob_id, 8192, fd1);
9031 ad493afc 2019-08-03 stsp /* fall through */
9032 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
9033 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
9034 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
9035 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
9036 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
9037 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9040 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
9043 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
9044 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
9045 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
9046 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
9047 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
9048 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
9051 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
9052 eb81bc23 2022-06-28 tracey staged_blob_id, 8192, fd2);
9055 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
9056 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
9057 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
9058 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
9059 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
9060 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
9061 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
9062 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
9063 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
9065 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
9066 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
9067 36bf999c 2020-07-23 stsp char *staged_target;
9068 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
9069 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
9071 36bf999c 2020-07-23 stsp goto done;
9072 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
9073 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
9074 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
9075 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
9076 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
9077 36bf999c 2020-07-23 stsp free(staged_target);
9079 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
9080 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
9081 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
9082 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
9083 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
9084 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
9085 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
9089 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
9092 2ac8aa02 2020-11-09 stsp if (err == NULL) {
9093 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
9094 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
9095 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9098 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
9099 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
9100 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
9101 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
9102 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9105 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
9107 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
9108 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
9112 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9113 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9114 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
9115 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
9118 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
9122 ad493afc 2019-08-03 stsp free(ondisk_path);
9123 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9124 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9125 ad493afc 2019-08-03 stsp if (blob_base)
9126 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
9127 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9128 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9129 ad493afc 2019-08-03 stsp if (blob_staged)
9130 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
9131 f69721c3 2019-10-21 stsp free(id_str);
9132 f69721c3 2019-10-21 stsp free(label_orig);
9133 ad493afc 2019-08-03 stsp return err;
9136 ad493afc 2019-08-03 stsp const struct got_error *
9137 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
9138 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
9139 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
9140 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
9141 ad493afc 2019-08-03 stsp struct got_repository *repo)
9143 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
9144 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9145 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
9146 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
9147 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
9149 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
9151 ad493afc 2019-08-03 stsp return err;
9153 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9155 ad493afc 2019-08-03 stsp goto done;
9157 ad493afc 2019-08-03 stsp upa.worktree = worktree;
9158 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
9159 ad493afc 2019-08-03 stsp upa.repo = repo;
9160 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
9161 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
9162 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
9163 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
9164 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
9165 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
9166 62da3196 2021-10-01 stsp unstage_path, &upa, NULL, NULL, 1, 0);
9168 ad493afc 2019-08-03 stsp goto done;
9171 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
9172 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
9173 ad493afc 2019-08-03 stsp err = sync_err;
9175 ad493afc 2019-08-03 stsp free(fileindex_path);
9176 ad493afc 2019-08-03 stsp if (fileindex)
9177 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
9178 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
9179 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
9180 ad493afc 2019-08-03 stsp err = unlockerr;
9181 ad493afc 2019-08-03 stsp return err;
9184 b2118c49 2020-07-28 stsp struct report_file_info_arg {
9185 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
9186 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
9187 b2118c49 2020-07-28 stsp void *info_arg;
9188 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
9189 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
9190 b2118c49 2020-07-28 stsp void *cancel_arg;
9193 b2118c49 2020-07-28 stsp static const struct got_error *
9194 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
9196 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
9197 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9198 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
9199 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9200 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
9201 b2118c49 2020-07-28 stsp int stage;
9203 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9204 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
9206 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
9207 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9208 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
9211 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
9212 b2118c49 2020-07-28 stsp return NULL;
9214 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_blob(ie))
9215 b4b2adf5 2023-02-09 op blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
9216 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
9217 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9218 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
9219 b4b2adf5 2023-02-09 op staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
9220 b4b2adf5 2023-02-09 op &staged_blob_id, ie);
9223 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_commit(ie))
9224 b4b2adf5 2023-02-09 op commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
9226 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9227 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9230 b2118c49 2020-07-28 stsp const struct got_error *
9231 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
9232 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
9233 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
9234 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
9237 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
9238 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
9239 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
9240 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
9242 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
9244 b2118c49 2020-07-28 stsp return err;
9246 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9248 b2118c49 2020-07-28 stsp goto done;
9250 b2118c49 2020-07-28 stsp arg.worktree = worktree;
9251 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
9252 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
9253 b2118c49 2020-07-28 stsp arg.paths = paths;
9254 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
9255 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
9256 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9259 b2118c49 2020-07-28 stsp free(fileindex_path);
9260 b2118c49 2020-07-28 stsp if (fileindex)
9261 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
9262 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
9263 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
9264 b2118c49 2020-07-28 stsp err = unlockerr;
9265 b2118c49 2020-07-28 stsp return err;
9268 78f5ac24 2022-03-19 op static const struct got_error *
9269 78f5ac24 2022-03-19 op patch_check_path(const char *p, char **path, unsigned char *status,
9270 78f5ac24 2022-03-19 op unsigned char *staged_status, struct got_fileindex *fileindex,
9271 78f5ac24 2022-03-19 op struct got_worktree *worktree, struct got_repository *repo)
9273 78f5ac24 2022-03-19 op const struct got_error *err;
9274 78f5ac24 2022-03-19 op struct got_fileindex_entry *ie;
9275 78f5ac24 2022-03-19 op struct stat sb;
9276 78f5ac24 2022-03-19 op char *ondisk_path = NULL;
9278 78f5ac24 2022-03-19 op err = got_worktree_resolve_path(path, worktree, p);
9282 78f5ac24 2022-03-19 op if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9283 78f5ac24 2022-03-19 op *path[0] ? "/" : "", *path) == -1)
9284 78f5ac24 2022-03-19 op return got_error_from_errno("asprintf");
9286 78f5ac24 2022-03-19 op ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9288 78f5ac24 2022-03-19 op *staged_status = get_staged_status(ie);
9289 a05fb460 2022-04-23 op err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9294 78f5ac24 2022-03-19 op *staged_status = GOT_STATUS_NO_CHANGE;
9295 78f5ac24 2022-03-19 op *status = GOT_STATUS_UNVERSIONED;
9296 78f5ac24 2022-03-19 op if (lstat(ondisk_path, &sb) == -1) {
9297 78f5ac24 2022-03-19 op if (errno != ENOENT) {
9298 78f5ac24 2022-03-19 op err = got_error_from_errno2("lstat",
9299 78f5ac24 2022-03-19 op ondisk_path);
9302 78f5ac24 2022-03-19 op *status = GOT_STATUS_NONEXISTENT;
9307 78f5ac24 2022-03-19 op free(ondisk_path);
9311 78f5ac24 2022-03-19 op static const struct got_error *
9312 78f5ac24 2022-03-19 op patch_can_rm(const char *path, unsigned char status,
9313 78f5ac24 2022-03-19 op unsigned char staged_status)
9315 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9316 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9317 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9318 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9319 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY &&
9320 78f5ac24 2022-03-19 op status != GOT_STATUS_MODE_CHANGE)
9321 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9322 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9323 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9324 78f5ac24 2022-03-19 op return NULL;
9327 78f5ac24 2022-03-19 op static const struct got_error *
9328 78f5ac24 2022-03-19 op patch_can_add(const char *path, unsigned char status)
9330 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NONEXISTENT)
9331 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9332 78f5ac24 2022-03-19 op return NULL;
9335 78f5ac24 2022-03-19 op static const struct got_error *
9336 78f5ac24 2022-03-19 op patch_can_edit(const char *path, unsigned char status,
9337 78f5ac24 2022-03-19 op unsigned char staged_status)
9339 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9340 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9341 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9342 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9343 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY)
9344 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9345 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9346 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9347 78f5ac24 2022-03-19 op return NULL;
9350 78f5ac24 2022-03-19 op const struct got_error *
9351 78f5ac24 2022-03-19 op got_worktree_patch_prepare(struct got_fileindex **fileindex,
9352 f2dd7807 2022-05-17 op char **fileindex_path, struct got_worktree *worktree)
9354 f2dd7807 2022-05-17 op return open_fileindex(fileindex, fileindex_path, worktree);
9357 78f5ac24 2022-03-19 op const struct got_error *
9358 78f5ac24 2022-03-19 op got_worktree_patch_check_path(const char *old, const char *new,
9359 78f5ac24 2022-03-19 op char **oldpath, char **newpath, struct got_worktree *worktree,
9360 78f5ac24 2022-03-19 op struct got_repository *repo, struct got_fileindex *fileindex)
9362 78f5ac24 2022-03-19 op const struct got_error *err = NULL;
9363 78f5ac24 2022-03-19 op int file_renamed = 0;
9364 78f5ac24 2022-03-19 op unsigned char status_old, staged_status_old;
9365 78f5ac24 2022-03-19 op unsigned char status_new, staged_status_new;
9367 78f5ac24 2022-03-19 op *oldpath = NULL;
9368 78f5ac24 2022-03-19 op *newpath = NULL;
9370 78f5ac24 2022-03-19 op err = patch_check_path(old != NULL ? old : new, oldpath,
9371 78f5ac24 2022-03-19 op &status_old, &staged_status_old, fileindex, worktree, repo);
9375 78f5ac24 2022-03-19 op err = patch_check_path(new != NULL ? new : old, newpath,
9376 78f5ac24 2022-03-19 op &status_new, &staged_status_new, fileindex, worktree, repo);
9380 78f5ac24 2022-03-19 op if (old != NULL && new != NULL && strcmp(old, new) != 0)
9381 78f5ac24 2022-03-19 op file_renamed = 1;
9383 78f5ac24 2022-03-19 op if (old != NULL && new == NULL)
9384 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9385 78f5ac24 2022-03-19 op else if (file_renamed) {
9386 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9387 78f5ac24 2022-03-19 op if (err == NULL)
9388 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9389 78f5ac24 2022-03-19 op } else if (old == NULL)
9390 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9392 78f5ac24 2022-03-19 op err = patch_can_edit(*newpath, status_new, staged_status_new);
9396 78f5ac24 2022-03-19 op free(*oldpath);
9397 78f5ac24 2022-03-19 op *oldpath = NULL;
9398 78f5ac24 2022-03-19 op free(*newpath);
9399 78f5ac24 2022-03-19 op *newpath = NULL;
9404 78f5ac24 2022-03-19 op const struct got_error *
9405 f2dd7807 2022-05-17 op got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9406 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9407 f2dd7807 2022-05-17 op got_worktree_checkout_cb progress_cb, void *progress_arg)
9409 f2dd7807 2022-05-17 op struct schedule_addition_args saa;
9411 f2dd7807 2022-05-17 op memset(&saa, 0, sizeof(saa));
9412 f2dd7807 2022-05-17 op saa.worktree = worktree;
9413 f2dd7807 2022-05-17 op saa.fileindex = fileindex;
9414 f2dd7807 2022-05-17 op saa.progress_cb = progress_cb;
9415 f2dd7807 2022-05-17 op saa.progress_arg = progress_arg;
9416 f2dd7807 2022-05-17 op saa.repo = repo;
9418 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9419 f2dd7807 2022-05-17 op schedule_addition, &saa, NULL, NULL, 1, 0);
9422 f2dd7807 2022-05-17 op const struct got_error *
9423 f2dd7807 2022-05-17 op got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9424 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9425 f2dd7807 2022-05-17 op got_worktree_delete_cb progress_cb, void *progress_arg)
9427 f2dd7807 2022-05-17 op struct schedule_deletion_args sda;
9429 f2dd7807 2022-05-17 op memset(&sda, 0, sizeof(sda));
9430 f2dd7807 2022-05-17 op sda.worktree = worktree;
9431 f2dd7807 2022-05-17 op sda.fileindex = fileindex;
9432 f2dd7807 2022-05-17 op sda.progress_cb = progress_cb;
9433 f2dd7807 2022-05-17 op sda.progress_arg = progress_arg;
9434 f2dd7807 2022-05-17 op sda.repo = repo;
9435 f2dd7807 2022-05-17 op sda.delete_local_mods = 0;
9436 f2dd7807 2022-05-17 op sda.keep_on_disk = 0;
9437 f2dd7807 2022-05-17 op sda.ignore_missing_paths = 0;
9438 f2dd7807 2022-05-17 op sda.status_codes = NULL;
9440 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9441 f2dd7807 2022-05-17 op schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9444 f2dd7807 2022-05-17 op const struct got_error *
9445 f2dd7807 2022-05-17 op got_worktree_patch_complete(struct got_fileindex *fileindex,
9446 4bcdc895 2022-05-17 op const char *fileindex_path)
9448 f2dd7807 2022-05-17 op const struct got_error *err = NULL;
9450 4bcdc895 2022-05-17 op err = sync_fileindex(fileindex, fileindex_path);
9451 4bcdc895 2022-05-17 op got_fileindex_free(fileindex);
