2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
19 133d2798 2019-01-08 stsp #include <sys/tree.h>
21 d1f6d47b 2019-02-04 stsp #include <dirent.h>
22 12ce7a6c 2019-08-12 stsp #include <limits.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 303e14b5 2019-09-23 stsp #include <time.h>
28 86c3caaf 2018-03-09 stsp #include <fcntl.h>
29 86c3caaf 2018-03-09 stsp #include <errno.h>
30 86c3caaf 2018-03-09 stsp #include <unistd.h>
31 9d31a1d8 2018-03-11 stsp #include <sha1.h>
32 9d31a1d8 2018-03-11 stsp #include <zlib.h>
33 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
34 512f0d0e 2019-01-02 stsp #include <libgen.h>
35 ec22038e 2019-03-10 stsp #include <uuid.h>
36 7154f6ce 2019-03-27 stsp #include <util.h>
38 86c3caaf 2018-03-09 stsp #include "got_error.h"
39 86c3caaf 2018-03-09 stsp #include "got_repository.h"
40 5261c201 2018-04-01 stsp #include "got_reference.h"
41 9d31a1d8 2018-03-11 stsp #include "got_object.h"
42 1dd54920 2019-05-11 stsp #include "got_path.h"
43 e6209546 2019-08-22 stsp #include "got_cancel.h"
44 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 234035bc 2019-06-01 stsp #include "got_diff.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
51 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
52 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
53 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
54 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
55 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
56 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
57 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
61 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
65 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
67 b2b3fce1 2022-10-29 op static mode_t apply_umask(mode_t);
69 99724ed4 2018-03-10 stsp static const struct got_error *
70 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
72 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
75 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
76 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
78 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
83 507dc3bb 2018-12-29 stsp static const struct got_error *
84 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
86 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
87 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
88 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
89 507dc3bb 2018-12-29 stsp char *path = NULL;
91 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
92 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
93 507dc3bb 2018-12-29 stsp path = NULL;
97 b90054ed 2022-11-01 stsp err = got_opentemp_named(&tmppath, &tmpfile, path, "");
101 507dc3bb 2018-12-29 stsp if (content) {
102 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
103 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
104 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
109 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
110 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
111 2a57020b 2019-02-20 stsp unlink(tmppath);
116 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
117 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
118 230a42bd 2019-05-11 jcs free(tmppath);
119 09fe317a 2018-03-11 stsp return err;
122 024e9686 2019-05-14 stsp static const struct got_error *
123 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
125 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
126 024e9686 2019-05-14 stsp char *refstr = NULL;
128 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
129 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
130 024e9686 2019-05-14 stsp if (refstr == NULL)
131 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
133 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
134 024e9686 2019-05-14 stsp if (refstr == NULL)
135 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
137 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
138 024e9686 2019-05-14 stsp free(refstr);
139 024e9686 2019-05-14 stsp return err;
142 86c3caaf 2018-03-09 stsp const struct got_error *
143 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
144 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
146 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
147 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
148 ec22038e 2019-03-10 stsp uuid_t uuid;
149 ec22038e 2019-03-10 stsp uint32_t uuid_status;
150 65596e15 2018-12-24 stsp int obj_type;
151 7ac97322 2018-03-11 stsp char *path_got = NULL;
152 1451e70d 2018-03-10 stsp char *formatstr = NULL;
153 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
154 65596e15 2018-12-24 stsp char *basestr = NULL;
155 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
157 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
158 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
162 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
164 65596e15 2018-12-24 stsp return err;
165 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
167 65596e15 2018-12-24 stsp return err;
168 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
169 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
171 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
172 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
173 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
176 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
177 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
178 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
182 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
183 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
184 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
187 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
188 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
192 056e7441 2018-03-11 stsp /* Create an empty lock file. */
193 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
197 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
198 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
202 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
203 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
207 65596e15 2018-12-24 stsp /* Record our base commit. */
208 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
211 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
215 1451e70d 2018-03-10 stsp /* Store path to repository. */
216 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
217 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
221 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
222 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
223 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
227 ec22038e 2019-03-10 stsp /* Generate UUID. */
228 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
229 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
230 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
233 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
234 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
235 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
238 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
242 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
243 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
244 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
247 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
252 65596e15 2018-12-24 stsp free(commit_id);
253 7ac97322 2018-03-11 stsp free(path_got);
254 1451e70d 2018-03-10 stsp free(formatstr);
255 0bb8a95e 2018-03-12 stsp free(absprefix);
256 65596e15 2018-12-24 stsp free(basestr);
257 ec22038e 2019-03-10 stsp free(uuidstr);
258 86c3caaf 2018-03-09 stsp return err;
261 247140b2 2019-02-05 stsp const struct got_error *
262 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
263 e5dc7198 2018-12-29 stsp const char *path_prefix)
265 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
267 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
268 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
269 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
271 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
272 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
273 e5dc7198 2018-12-29 stsp free(absprefix);
274 e5dc7198 2018-12-29 stsp return NULL;
277 bc70eb79 2019-05-09 stsp const char *
278 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
280 36a38700 2019-05-10 stsp return worktree->head_ref_name;
283 024e9686 2019-05-14 stsp const struct got_error *
284 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
285 024e9686 2019-05-14 stsp struct got_reference *head_ref)
287 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
288 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
290 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
291 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
292 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
293 024e9686 2019-05-14 stsp path_got = NULL;
297 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
298 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
299 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
303 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
307 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
308 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
310 024e9686 2019-05-14 stsp free(path_got);
312 024e9686 2019-05-14 stsp free(head_ref_name);
313 024e9686 2019-05-14 stsp return err;
316 b72f483a 2019-02-05 stsp struct got_object_id *
317 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
319 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
322 507dc3bb 2018-12-29 stsp const struct got_error *
323 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
324 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
326 507dc3bb 2018-12-29 stsp const struct got_error *err;
327 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
328 507dc3bb 2018-12-29 stsp char *id_str = NULL;
329 507dc3bb 2018-12-29 stsp char *path_got = NULL;
331 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
332 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
333 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
334 507dc3bb 2018-12-29 stsp path_got = NULL;
338 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
340 507dc3bb 2018-12-29 stsp return err;
342 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
343 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
347 507dc3bb 2018-12-29 stsp /* Record our base commit. */
348 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
351 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
355 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
356 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
357 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
358 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
363 507dc3bb 2018-12-29 stsp got_object_close(obj);
364 507dc3bb 2018-12-29 stsp free(id_str);
365 507dc3bb 2018-12-29 stsp free(path_got);
366 507dc3bb 2018-12-29 stsp return err;
369 50b0790e 2020-09-11 stsp const struct got_gotconfig *
370 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
372 50b0790e 2020-09-11 stsp return worktree->gotconfig;
375 9d31a1d8 2018-03-11 stsp static const struct got_error *
376 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
378 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
379 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
380 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
381 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
382 86c3caaf 2018-03-09 stsp return NULL;
385 21908da4 2019-01-13 stsp static const struct got_error *
386 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
388 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
389 4a1ddfc2 2019-01-12 stsp char *abspath;
391 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
392 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
394 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
395 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
396 ddcd8544 2019-03-11 stsp struct stat sb;
397 ddcd8544 2019-03-11 stsp err = NULL;
398 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
399 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
400 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
401 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
402 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
405 4a1ddfc2 2019-01-12 stsp free(abspath);
406 68c76935 2019-02-19 stsp return err;
409 68c76935 2019-02-19 stsp static const struct got_error *
410 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
412 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
413 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
414 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
415 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
420 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
421 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
422 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
425 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
426 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
427 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
430 68c76935 2019-02-19 stsp if (flen1 == 0) {
431 68c76935 2019-02-19 stsp if (flen2 != 0)
434 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
435 68c76935 2019-02-19 stsp if (flen1 != 0)
438 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
439 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
449 68c76935 2019-02-19 stsp return err;
452 68c76935 2019-02-19 stsp static const struct got_error *
453 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
455 68c76935 2019-02-19 stsp struct stat sb;
456 68c76935 2019-02-19 stsp size_t size1, size2;
460 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
461 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
462 68c76935 2019-02-19 stsp size1 = sb.st_size;
464 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
465 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
466 68c76935 2019-02-19 stsp size2 = sb.st_size;
468 68c76935 2019-02-19 stsp if (size1 != size2) {
470 68c76935 2019-02-19 stsp return NULL;
473 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
474 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
475 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
476 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
478 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
481 0e039681 2021-11-15 stsp static const struct got_error *
482 0e039681 2021-11-15 stsp copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
484 0e039681 2021-11-15 stsp uint8_t fbuf[65536];
485 0e039681 2021-11-15 stsp size_t flen;
486 0e039681 2021-11-15 stsp ssize_t outlen;
488 0e039681 2021-11-15 stsp *outsize = 0;
490 0e039681 2021-11-15 stsp if (fseek(f, 0L, SEEK_SET) == -1)
491 0e039681 2021-11-15 stsp return got_ferror(f, GOT_ERR_IO);
494 0e039681 2021-11-15 stsp flen = fread(fbuf, 1, sizeof(fbuf), f);
495 0e039681 2021-11-15 stsp if (flen == 0) {
496 0e039681 2021-11-15 stsp if (ferror(f))
497 0e039681 2021-11-15 stsp return got_error_from_errno("fread");
498 0e039681 2021-11-15 stsp if (feof(f))
501 0e039681 2021-11-15 stsp outlen = write(outfd, fbuf, flen);
502 0e039681 2021-11-15 stsp if (outlen == -1)
503 0e039681 2021-11-15 stsp return got_error_from_errno("write");
504 0e039681 2021-11-15 stsp if (outlen != flen)
505 0e039681 2021-11-15 stsp return got_error(GOT_ERR_IO);
506 0e039681 2021-11-15 stsp *outsize += outlen;
509 0e039681 2021-11-15 stsp return NULL;
512 0e039681 2021-11-15 stsp static const struct got_error *
513 0e039681 2021-11-15 stsp merge_binary_file(int *overlapcnt, int merged_fd,
514 0e039681 2021-11-15 stsp FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
515 0e039681 2021-11-15 stsp const char *label_deriv, const char *label_orig, const char *label_deriv2,
516 0e039681 2021-11-15 stsp const char *ondisk_path)
518 0e039681 2021-11-15 stsp const struct got_error *err = NULL;
519 0e039681 2021-11-15 stsp int same_content, changed_deriv, changed_deriv2;
520 0e039681 2021-11-15 stsp int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
521 0e039681 2021-11-15 stsp off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
522 0e039681 2021-11-15 stsp char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
523 0e039681 2021-11-15 stsp char *base_path_orig = NULL, *base_path_deriv = NULL;
524 0e039681 2021-11-15 stsp char *base_path_deriv2 = NULL;
526 0e039681 2021-11-15 stsp *overlapcnt = 0;
528 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_deriv2);
530 0e039681 2021-11-15 stsp return err;
532 0e039681 2021-11-15 stsp if (same_content)
533 0e039681 2021-11-15 stsp return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
535 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_orig);
537 0e039681 2021-11-15 stsp return err;
538 0e039681 2021-11-15 stsp changed_deriv = !same_content;
539 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv2, f_orig);
541 0e039681 2021-11-15 stsp return err;
542 0e039681 2021-11-15 stsp changed_deriv2 = !same_content;
544 0e039681 2021-11-15 stsp if (changed_deriv && changed_deriv2) {
545 0e039681 2021-11-15 stsp *overlapcnt = 1;
546 0e039681 2021-11-15 stsp if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
547 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
550 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
551 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
554 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
555 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
558 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_orig, &fd_orig,
559 b90054ed 2022-11-01 stsp base_path_orig, "");
562 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
563 b90054ed 2022-11-01 stsp base_path_deriv, "");
566 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
567 b90054ed 2022-11-01 stsp base_path_deriv2, "");
570 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
573 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
576 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
579 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "Binary files differ and cannot be "
580 0e039681 2021-11-15 stsp "merged automatically:\n") < 0) {
581 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
584 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
585 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
586 0e039681 2021-11-15 stsp label_deriv ? " " : "",
587 0e039681 2021-11-15 stsp label_deriv ? label_deriv : "",
588 0e039681 2021-11-15 stsp path_deriv) < 0) {
589 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
592 0e039681 2021-11-15 stsp if (size_orig > 0) {
593 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
594 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_ORIG,
595 0e039681 2021-11-15 stsp label_orig ? " " : "",
596 0e039681 2021-11-15 stsp label_orig ? label_orig : "",
597 0e039681 2021-11-15 stsp path_orig) < 0) {
598 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
602 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
603 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
604 0e039681 2021-11-15 stsp path_deriv2,
605 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_END,
606 0e039681 2021-11-15 stsp label_deriv2 ? " " : "",
607 0e039681 2021-11-15 stsp label_deriv2 ? label_deriv2 : "") < 0) {
608 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
611 0e039681 2021-11-15 stsp } else if (changed_deriv)
612 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
613 0e039681 2021-11-15 stsp else if (changed_deriv2)
614 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
616 0e039681 2021-11-15 stsp if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
617 0e039681 2021-11-15 stsp err == NULL)
618 0e039681 2021-11-15 stsp err = got_error_from_errno2("unlink", path_orig);
619 0e039681 2021-11-15 stsp if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
620 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_orig);
621 0e039681 2021-11-15 stsp if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
622 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv);
623 0e039681 2021-11-15 stsp if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
624 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv2);
625 0e039681 2021-11-15 stsp free(path_orig);
626 0e039681 2021-11-15 stsp free(path_deriv);
627 0e039681 2021-11-15 stsp free(path_deriv2);
628 0e039681 2021-11-15 stsp free(base_path_orig);
629 0e039681 2021-11-15 stsp free(base_path_deriv);
630 0e039681 2021-11-15 stsp free(base_path_deriv2);
631 0e039681 2021-11-15 stsp return err;
635 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
636 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
637 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
638 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
639 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
641 6353ad76 2019-02-08 stsp static const struct got_error *
642 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
643 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
644 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
645 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
646 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
647 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
649 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
650 6353ad76 2019-02-08 stsp int merged_fd = -1;
651 db590691 2021-06-02 stsp FILE *f_merged = NULL;
652 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
653 234035bc 2019-06-01 stsp int overlapcnt = 0;
654 3524bbf9 2020-10-20 stsp char *parent = NULL;
656 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
658 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
660 3524bbf9 2020-10-20 stsp return err;
662 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
663 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
667 b90054ed 2022-11-01 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
671 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
672 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
674 0e039681 2021-11-15 stsp if (err->code != GOT_ERR_FILE_BINARY)
676 0e039681 2021-11-15 stsp err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
677 0e039681 2021-11-15 stsp f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
678 0e039681 2021-11-15 stsp ondisk_path);
683 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
684 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
688 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
693 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
694 db590691 2021-06-02 stsp if (f_merged == NULL) {
695 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
698 db590691 2021-06-02 stsp merged_fd = -1;
700 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
701 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
702 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
708 b2b3fce1 2022-10-29 op if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
709 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
713 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
714 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
715 230a42bd 2019-05-11 jcs ondisk_path);
720 fdcb7daf 2019-12-15 stsp if (merged_path)
721 fdcb7daf 2019-12-15 stsp unlink(merged_path);
723 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
724 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
725 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
726 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
727 6353ad76 2019-02-08 stsp free(merged_path);
728 af54ae4a 2019-02-19 stsp free(base_path);
729 3524bbf9 2020-10-20 stsp free(parent);
730 af57b12a 2020-07-23 stsp return err;
733 af57b12a 2020-07-23 stsp static const struct got_error *
734 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
735 af57b12a 2020-07-23 stsp size_t target_len)
737 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
738 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
739 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
740 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
741 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
742 af57b12a 2020-07-23 stsp ondisk_path);
743 af57b12a 2020-07-23 stsp return NULL;
747 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
748 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
749 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
750 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
752 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
753 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
755 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
756 993e2a1b 2020-07-23 stsp * has deleted this symlink.
758 11cc08c1 2020-07-23 stsp static const struct got_error *
759 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
760 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
761 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
763 11cc08c1 2020-07-23 stsp const struct got_error *err;
764 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
765 11cc08c1 2020-07-23 stsp FILE *f = NULL;
767 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
769 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
771 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
772 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
773 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
777 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
779 3818e3c4 2020-11-01 naddy goto done;
781 b2b3fce1 2022-10-29 op if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
782 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
786 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
787 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
788 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
789 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
790 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
791 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
792 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
793 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
794 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
795 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
799 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
800 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
803 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
804 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
808 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
809 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
810 11cc08c1 2020-07-23 stsp free(path);
811 11cc08c1 2020-07-23 stsp free(id_str);
812 11cc08c1 2020-07-23 stsp free(label_deriv);
813 11cc08c1 2020-07-23 stsp return err;
816 d219f183 2020-07-23 stsp /* forward declaration */
817 d219f183 2020-07-23 stsp static const struct got_error *
818 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
819 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
820 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
821 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
824 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
825 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
826 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
827 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
829 af57b12a 2020-07-23 stsp static const struct got_error *
830 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
831 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
832 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
833 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
834 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
836 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
837 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
838 af57b12a 2020-07-23 stsp struct stat sb;
839 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
840 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
841 11cc08c1 2020-07-23 stsp int have_local_change = 0;
842 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
844 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
845 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
847 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
848 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
849 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
850 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
851 af57b12a 2020-07-23 stsp ondisk_path);
854 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
856 526a746f 2020-07-23 stsp if (blob_orig) {
857 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
862 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
863 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
864 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
865 11cc08c1 2020-07-23 stsp have_local_change = 1;
867 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
868 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
869 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
870 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
871 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
873 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
874 11cc08c1 2020-07-23 stsp if (ancestor_target) {
875 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
876 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
878 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
879 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
880 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
881 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
884 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
885 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
886 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
887 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
890 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
893 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
894 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
895 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
896 af57b12a 2020-07-23 stsp strlen(deriv_target));
899 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
900 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
901 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
902 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
903 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
904 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
907 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
908 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
909 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
912 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
918 af57b12a 2020-07-23 stsp free(ancestor_target);
919 eec2f5a9 2021-06-03 stsp return err;
922 eec2f5a9 2021-06-03 stsp static const struct got_error *
923 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
925 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
926 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
927 eec2f5a9 2021-06-03 stsp ssize_t target_len;
931 eec2f5a9 2021-06-03 stsp *outfile = NULL;
933 eec2f5a9 2021-06-03 stsp f = got_opentemp();
934 eec2f5a9 2021-06-03 stsp if (f == NULL)
935 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
936 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
937 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
938 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
941 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
942 eec2f5a9 2021-06-03 stsp if (n != target_len) {
943 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
946 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
947 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
950 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
951 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
958 eec2f5a9 2021-06-03 stsp *outfile = f;
959 14c901f1 2019-08-08 stsp return err;
963 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
964 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
965 14c901f1 2019-08-08 stsp * acts as the second derived version.
967 14c901f1 2019-08-08 stsp static const struct got_error *
968 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
969 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
970 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
971 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
972 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
973 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
975 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
976 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
977 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
978 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
979 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
981 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
983 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
985 ed6b5030 2020-10-20 stsp return err;
987 67a66647 2021-05-31 stsp if (blob_orig) {
988 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
989 67a66647 2021-05-31 stsp parent) == -1) {
990 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
991 67a66647 2021-05-31 stsp base_path = NULL;
995 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_orig_path, &f_orig,
996 b90054ed 2022-11-01 stsp base_path, "");
999 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1000 67a66647 2021-05-31 stsp blob_orig);
1002 67a66647 2021-05-31 stsp goto done;
1003 67a66647 2021-05-31 stsp free(base_path);
1006 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1007 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1008 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1010 db590691 2021-06-02 stsp f_orig = got_opentemp();
1011 db590691 2021-06-02 stsp if (f_orig == NULL) {
1012 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1013 db590691 2021-06-02 stsp goto done;
1017 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1018 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1019 14c901f1 2019-08-08 stsp base_path = NULL;
1020 14c901f1 2019-08-08 stsp goto done;
1023 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1025 14c901f1 2019-08-08 stsp goto done;
1026 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1027 14c901f1 2019-08-08 stsp blob_deriv);
1029 14c901f1 2019-08-08 stsp goto done;
1031 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1033 14c901f1 2019-08-08 stsp goto done;
1034 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1035 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1036 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1037 14c901f1 2019-08-08 stsp goto done;
1041 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1042 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1044 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1045 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1047 eec2f5a9 2021-06-03 stsp goto done;
1050 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1051 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1052 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1053 eec2f5a9 2021-06-03 stsp goto done;
1055 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1056 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1057 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1058 eec2f5a9 2021-06-03 stsp close(fd);
1059 eec2f5a9 2021-06-03 stsp goto done;
1063 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1064 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1065 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1067 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1068 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1069 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1070 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1071 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1072 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1073 14c901f1 2019-08-08 stsp free(base_path);
1074 67a66647 2021-05-31 stsp if (blob_orig_path) {
1075 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1076 67a66647 2021-05-31 stsp free(blob_orig_path);
1078 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1079 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1080 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1082 6353ad76 2019-02-08 stsp free(id_str);
1083 818c7501 2019-07-11 stsp free(label_deriv);
1084 ed6b5030 2020-10-20 stsp free(parent);
1085 4a1ddfc2 2019-01-12 stsp return err;
1088 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1089 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1090 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1091 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1093 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1094 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1096 65b05cec 2020-07-23 stsp *new_iep = NULL;
1098 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1100 054041d0 2020-06-24 stsp return err;
1102 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1103 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1105 054041d0 2020-06-24 stsp goto done;
1107 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1110 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1112 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1113 13d9040b 2019-03-27 stsp return err;
1116 1ebedb77 2019-10-19 stsp static mode_t
1117 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1119 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1121 1ebedb77 2019-10-19 stsp if (executable) {
1122 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1123 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1124 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1125 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1126 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1127 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1130 b2b3fce1 2022-10-29 op return st_mode;
1133 b2b3fce1 2022-10-29 op static mode_t
1134 b2b3fce1 2022-10-29 op apply_umask(mode_t mode)
1138 b2b3fce1 2022-10-29 op um = umask(000);
1140 b2b3fce1 2022-10-29 op return mode & ~um;
1143 8ba819a3 2020-07-23 stsp /* forward declaration */
1144 13d9040b 2019-03-27 stsp static const struct got_error *
1145 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1146 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1147 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1148 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1149 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1150 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1153 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1154 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1156 8ba819a3 2020-07-23 stsp static const struct got_error *
1157 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1158 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1160 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1161 5a1fbc73 2020-07-23 stsp ssize_t elen;
1162 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1165 c6e8a826 2021-04-05 stsp *did_something = 0;
1168 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1169 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1170 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1171 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1172 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1173 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1175 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1176 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1177 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink())
1178 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1180 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1181 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1182 5a1fbc73 2020-07-23 stsp if (elen == -1)
1183 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1185 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1186 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1187 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1190 c6e8a826 2021-04-05 stsp *did_something = 1;
1191 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1192 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1193 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1194 5a1fbc73 2020-07-23 stsp return err;
1197 3c1ec782 2020-07-23 stsp static const struct got_error *
1198 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1199 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1201 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1202 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1203 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1205 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1207 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1208 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1209 3c1ec782 2020-07-23 stsp return NULL;
1213 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1214 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1215 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1216 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1217 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1219 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1220 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1221 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1223 ce031e9e 2020-10-20 stsp return err;
1224 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1225 ce031e9e 2020-10-20 stsp free(parent);
1226 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1228 ce031e9e 2020-10-20 stsp free(parent);
1229 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1230 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1231 3c1ec782 2020-07-23 stsp free(abspath);
1232 3c1ec782 2020-07-23 stsp return err;
1234 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1235 3c1ec782 2020-07-23 stsp free(abspath);
1237 3c1ec782 2020-07-23 stsp return err;
1239 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1241 3c1ec782 2020-07-23 stsp return err;
1244 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1245 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1246 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1247 3c1ec782 2020-07-23 stsp return NULL;
1250 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1251 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1252 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1253 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1254 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1255 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1257 3c1ec782 2020-07-23 stsp free(path_got);
1258 3c1ec782 2020-07-23 stsp return NULL;
1261 5a1fbc73 2020-07-23 stsp static const struct got_error *
1262 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1263 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1264 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1265 5267b9e4 2021-09-26 stsp int path_is_unversioned, int allow_bad_symlinks,
1266 5267b9e4 2021-09-26 stsp struct got_repository *repo,
1267 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1269 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1270 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1271 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1272 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1273 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1275 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1278 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1279 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1280 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1281 8ba819a3 2020-07-23 stsp * in the blob object.
1284 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1285 538b6881 2022-07-21 florian if (err)
1286 538b6881 2022-07-21 florian return err;
1288 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1289 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1290 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1291 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1292 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1293 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1294 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1295 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1296 3b9f0f87 2020-07-23 stsp progress_arg);
1298 8ba819a3 2020-07-23 stsp if (len > 0) {
1299 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1300 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1301 8ba819a3 2020-07-23 stsp len - hdrlen);
1302 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1303 8ba819a3 2020-07-23 stsp hdrlen = 0;
1305 8ba819a3 2020-07-23 stsp } while (len != 0);
1306 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1308 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1309 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1311 3c1ec782 2020-07-23 stsp return err;
1313 5267b9e4 2021-09-26 stsp if (*is_bad_symlink && !allow_bad_symlinks) {
1314 906c123b 2020-07-23 stsp /* install as a regular file */
1315 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1316 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1317 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1318 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1319 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1320 3c29341b 2022-07-21 florian return err;
1323 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1324 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1325 c6e8a826 2021-04-05 stsp int symlink_replaced;
1326 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1327 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1328 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1329 3c29341b 2022-07-21 florian return err;
1331 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1332 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1334 3c29341b 2022-07-21 florian return err;
1335 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1336 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1337 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1338 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1339 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1340 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1342 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1343 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1346 3c29341b 2022-07-21 florian return err; /* Nothing else to do. */
1349 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1350 f4994adc 2020-10-20 stsp char *parent;
1351 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1353 3c29341b 2022-07-21 florian return err;
1354 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1355 f4994adc 2020-10-20 stsp free(parent);
1357 3c29341b 2022-07-21 florian return err;
1359 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1360 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1362 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1363 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1364 3c29341b 2022-07-21 florian return err;
1368 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1369 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1370 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1371 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1372 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1373 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1374 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1375 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1376 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1377 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1378 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1379 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1380 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1382 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1383 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1385 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1386 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1387 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1388 8ba819a3 2020-07-23 stsp return err;
1391 8ba819a3 2020-07-23 stsp static const struct got_error *
1392 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1393 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1394 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1395 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1396 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1397 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1399 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1400 507dc3bb 2018-12-29 stsp int fd = -1;
1401 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1402 507dc3bb 2018-12-29 stsp int update = 0;
1403 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1404 b2b3fce1 2022-10-29 op mode_t mode;
1406 b2b3fce1 2022-10-29 op mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1407 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1408 b2b3fce1 2022-10-29 op O_CLOEXEC, mode);
1409 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1410 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1411 f5375317 2020-10-20 stsp char *parent;
1412 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1414 f5375317 2020-10-20 stsp return err;
1415 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1416 f5375317 2020-10-20 stsp free(parent);
1418 21908da4 2019-01-13 stsp return err;
1419 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1420 8bd0cdad 2021-12-31 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1422 21908da4 2019-01-13 stsp if (fd == -1)
1423 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1424 230a42bd 2019-05-11 jcs ondisk_path);
1425 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1426 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1427 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1428 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1429 3b9f0f87 2020-07-23 stsp goto done;
1431 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1432 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1433 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1434 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1435 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1436 507dc3bb 2018-12-29 stsp goto done;
1438 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1439 b90054ed 2022-11-01 stsp ondisk_path, "");
1441 507dc3bb 2018-12-29 stsp goto done;
1442 507dc3bb 2018-12-29 stsp update = 1;
1444 b2b3fce1 2022-10-29 op if (fchmod(fd, apply_umask(mode)) == -1) {
1445 b2b3fce1 2022-10-29 op err = got_error_from_errno2("fchmod",
1451 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1454 bd6aa359 2020-07-23 stsp if (progress_cb) {
1455 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1456 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1458 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1459 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1462 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1463 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1465 bd6aa359 2020-07-23 stsp goto done;
1468 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1470 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1471 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1474 9d31a1d8 2018-03-11 stsp if (len > 0) {
1475 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1476 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1477 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1478 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1479 b87c6f83 2018-12-24 stsp goto done;
1480 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1481 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1482 b87c6f83 2018-12-24 stsp goto done;
1484 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1486 9d31a1d8 2018-03-11 stsp } while (len != 0);
1488 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1489 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1490 816dc654 2019-02-16 stsp goto done;
1493 507dc3bb 2018-12-29 stsp if (update) {
1494 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1495 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1496 f6d8c0ac 2020-11-09 stsp goto done;
1498 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1499 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1500 230a42bd 2019-05-11 jcs ondisk_path);
1501 68ed9ba5 2019-02-10 stsp goto done;
1503 63df146d 2020-11-09 stsp free(tmppath);
1504 63df146d 2020-11-09 stsp tmppath = NULL;
1508 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1509 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1510 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1511 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1512 507dc3bb 2018-12-29 stsp free(tmppath);
1513 6353ad76 2019-02-08 stsp return err;
1516 d952957d 2023-02-19 mark static const struct got_error *skip_one_line(FILE *);
1519 12383673 2023-02-18 mark * Upgrade STATUS_MODIFY to STATUS_CONFLICT if a
1520 12383673 2023-02-18 mark * conflict marker is found in newly added lines only.
1522 6353ad76 2019-02-08 stsp static const struct got_error *
1523 12383673 2023-02-18 mark get_modified_file_content_status(unsigned char *status,
1524 12383673 2023-02-18 mark struct got_blob_object *blob, const char *path, struct stat *sb,
1525 12383673 2023-02-18 mark FILE *ondisk_file)
1527 d952957d 2023-02-19 mark const struct got_error *err, *free_err;
1528 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1529 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1530 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1531 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1533 d952957d 2023-02-19 mark FILE *f1 = NULL;
1534 d952957d 2023-02-19 mark struct got_diffreg_result *diffreg_result = NULL;
1535 d952957d 2023-02-19 mark struct diff_result *r;
1536 d952957d 2023-02-19 mark int nchunks_parsed, n, i = 0, ln = 0;
1537 9bdd68dd 2020-01-02 naddy char *line = NULL;
1538 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1539 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1541 d952957d 2023-02-19 mark if (*status != GOT_STATUS_MODIFY)
1542 d952957d 2023-02-19 mark return NULL;
1544 d952957d 2023-02-19 mark f1 = got_opentemp();
1545 d952957d 2023-02-19 mark if (f1 == NULL)
1546 d952957d 2023-02-19 mark return got_error_from_errno("got_opentemp");
1548 d952957d 2023-02-19 mark if (blob) {
1549 d952957d 2023-02-19 mark got_object_blob_rewind(blob);
1550 d952957d 2023-02-19 mark err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
1552 12383673 2023-02-18 mark goto done;
1555 d952957d 2023-02-19 mark err = got_diff_files(&diffreg_result, f1, 1, NULL, ondisk_file,
1556 d952957d 2023-02-19 mark 1, NULL, 0, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
1558 d952957d 2023-02-19 mark goto done;
1560 d952957d 2023-02-19 mark r = diffreg_result->result;
1562 d952957d 2023-02-19 mark for (n = 0; n < r->chunks.len; n += nchunks_parsed) {
1563 d952957d 2023-02-19 mark struct diff_chunk *c;
1564 d952957d 2023-02-19 mark struct diff_chunk_context cc = {};
1565 7783f73c 2023-02-20 mark off_t pos;
1566 d952957d 2023-02-19 mark int clc, crc;
1569 d952957d 2023-02-19 mark * We can optimise a little by advancing straight
1570 d952957d 2023-02-19 mark * to the next chunk if this one has no added lines.
1572 d952957d 2023-02-19 mark c = diff_chunk_get(r, n);
1573 d952957d 2023-02-19 mark clc = diff_chunk_get_left_count(c);
1574 d952957d 2023-02-19 mark crc = diff_chunk_get_right_count(c);
1576 7783f73c 2023-02-20 mark if (!crc || crc == clc) {
1577 d952957d 2023-02-19 mark nchunks_parsed = 1;
1578 7783f73c 2023-02-20 mark continue; /* removed or unchanged lines */
1581 7783f73c 2023-02-20 mark pos = diff_chunk_get_right_start_pos(c);
1582 7783f73c 2023-02-20 mark if (fseek(ondisk_file, pos, SEEK_SET) == -1) {
1583 7783f73c 2023-02-20 mark err = got_ferror(ondisk_file, GOT_ERR_IO);
1584 7783f73c 2023-02-20 mark goto done;
1587 7783f73c 2023-02-20 mark diff_chunk_context_load_change(&cc, &nchunks_parsed, r, n, 0);
1588 7783f73c 2023-02-20 mark ln = cc.right.start;
1590 d952957d 2023-02-19 mark while (ln < cc.right.end) {
1591 d952957d 2023-02-19 mark linelen = getline(&line, &linesize, ondisk_file);
1592 d952957d 2023-02-19 mark if (linelen == -1) {
1593 d952957d 2023-02-19 mark if (feof(ondisk_file))
1595 d952957d 2023-02-19 mark err = got_ferror(ondisk_file, GOT_ERR_IO);
1599 d952957d 2023-02-19 mark if (line && strncmp(line, markers[i],
1600 d952957d 2023-02-19 mark strlen(markers[i])) == 0) {
1601 d952957d 2023-02-19 mark if (strcmp(markers[i],
1602 d952957d 2023-02-19 mark GOT_DIFF_CONFLICT_MARKER_END) == 0) {
1603 d952957d 2023-02-19 mark *status = GOT_STATUS_CONFLICT;
1604 d952957d 2023-02-19 mark goto done;
1613 9bdd68dd 2020-01-02 naddy free(line);
1614 12383673 2023-02-18 mark if (f1 != NULL && fclose(f1) == EOF && err == NULL)
1615 12383673 2023-02-18 mark err = got_error_from_errno("fclose");
1616 d952957d 2023-02-19 mark free_err = got_diffreg_result_free(diffreg_result);
1617 d952957d 2023-02-19 mark if (err == NULL)
1618 d952957d 2023-02-19 mark err = free_err;
1620 7154f6ce 2019-03-27 stsp return err;
1623 e2b1e152 2019-07-13 stsp static int
1624 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1626 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1627 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1630 1ebedb77 2019-10-19 stsp static int
1631 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1633 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1634 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1635 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1636 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1637 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1638 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1641 c363b2c1 2019-08-03 stsp static unsigned char
1642 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1644 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1645 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1646 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1647 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1648 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1649 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1650 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1652 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1656 a919d5c4 2020-07-23 stsp static const struct got_error *
1657 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1658 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1659 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1661 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1662 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1663 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1664 a919d5c4 2020-07-23 stsp ssize_t elen;
1665 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1666 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1667 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1669 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1671 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1673 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1675 a919d5c4 2020-07-23 stsp return err;
1676 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1678 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1679 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1681 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1683 a919d5c4 2020-07-23 stsp if (len > 0) {
1684 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1685 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1686 a919d5c4 2020-07-23 stsp len - hdrlen);
1687 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1688 a919d5c4 2020-07-23 stsp hdrlen = 0;
1690 a919d5c4 2020-07-23 stsp } while (len != 0);
1691 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1693 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1694 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1695 a919d5c4 2020-07-23 stsp if (elen == -1)
1696 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1698 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1699 a919d5c4 2020-07-23 stsp if (elen == -1)
1700 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1703 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1704 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1706 a919d5c4 2020-07-23 stsp return NULL;
1709 7154f6ce 2019-03-27 stsp static const struct got_error *
1710 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1711 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1712 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1714 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1715 6353ad76 2019-02-08 stsp struct got_object_id id;
1716 6353ad76 2019-02-08 stsp size_t hdrlen;
1717 eb81bc23 2022-06-28 tracey int fd = -1, fd1 = -1;
1718 6353ad76 2019-02-08 stsp FILE *f = NULL;
1719 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1720 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1721 6353ad76 2019-02-08 stsp size_t flen, blen;
1722 2c4740ad 2023-02-12 mark unsigned char staged_status;
1724 2c4740ad 2023-02-12 mark staged_status = get_staged_status(ie);
1725 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1726 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1729 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1730 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1731 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1733 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1734 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1735 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1736 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1737 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1739 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1740 882ef1b9 2019-12-13 stsp goto done;
1742 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1743 3d35a492 2019-12-13 stsp goto done;
1746 8bd0cdad 2021-12-31 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1747 5c02d2a5 2021-09-26 stsp if (fd == -1 && errno != ENOENT &&
1748 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
1749 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1750 5c02d2a5 2021-09-26 stsp else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1751 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1752 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1753 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1754 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1755 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1756 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1758 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1759 3d35a492 2019-12-13 stsp goto done;
1761 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1762 1338848f 2019-12-13 stsp goto done;
1766 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1767 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1768 1338848f 2019-12-13 stsp goto done;
1771 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1772 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1773 1338848f 2019-12-13 stsp goto done;
1774 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1775 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1776 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1777 1338848f 2019-12-13 stsp goto done;
1780 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1781 f179e66d 2020-07-23 stsp goto done;
1783 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1784 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1785 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1786 1338848f 2019-12-13 stsp goto done;
1789 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1790 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1791 b4b2adf5 2023-02-09 op got_fileindex_entry_get_staged_blob_id(&id, ie);
1793 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&id, ie);
1795 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1796 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1797 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1798 eb81bc23 2022-06-28 tracey goto done;
1800 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1802 1338848f 2019-12-13 stsp goto done;
1804 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1805 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1806 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1807 a919d5c4 2020-07-23 stsp goto done;
1810 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1811 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1812 ab0d4361 2019-12-13 stsp if (fd == -1) {
1813 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1814 ab0d4361 2019-12-13 stsp goto done;
1818 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1819 6353ad76 2019-02-08 stsp if (f == NULL) {
1820 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1821 6353ad76 2019-02-08 stsp goto done;
1824 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1826 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1827 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1829 7154f6ce 2019-03-27 stsp goto done;
1830 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1831 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1832 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1833 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1834 7154f6ce 2019-03-27 stsp goto done;
1836 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1837 6353ad76 2019-02-08 stsp if (flen != 0)
1838 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1840 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1841 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1842 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1844 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1845 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1846 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1847 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1851 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1854 6353ad76 2019-02-08 stsp hdrlen = 0;
1857 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1858 7154f6ce 2019-03-27 stsp rewind(f);
1859 12383673 2023-02-18 mark err = get_modified_file_content_status(status, blob, ie->path,
1861 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1862 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1864 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1865 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
1867 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1868 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1869 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1870 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1871 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1872 9d31a1d8 2018-03-11 stsp return err;
1876 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1877 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1879 e2b1e152 2019-07-13 stsp static const struct got_error *
1880 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1881 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1883 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1884 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1885 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1887 e2b1e152 2019-07-13 stsp return NULL;
1890 9d31a1d8 2018-03-11 stsp static const struct got_error *
1891 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1892 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1893 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1894 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1895 0584f854 2019-04-06 stsp void *progress_arg)
1897 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1898 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1899 eb81bc23 2022-06-28 tracey char *ondisk_path = NULL;
1900 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1901 b8f41171 2019-02-10 stsp struct stat sb;
1902 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
1904 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1905 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1908 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1909 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1910 a76c42e6 2019-08-03 stsp goto done;
1912 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1915 abb4604f 2019-07-27 stsp goto done;
1916 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1917 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1919 f6764181 2021-09-24 stsp if (stat(ondisk_path, &sb) == -1) {
1920 f6764181 2021-09-24 stsp if (errno != ENOENT) {
1921 f6764181 2021-09-24 stsp err = got_error_from_errno2("stat",
1922 f6764181 2021-09-24 stsp ondisk_path);
1923 f6764181 2021-09-24 stsp goto done;
1925 f6764181 2021-09-24 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1926 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1928 f6764181 2021-09-24 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1929 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1931 f6764181 2021-09-24 stsp status = GOT_STATUS_OBSTRUCTED;
1935 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1937 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1938 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1939 b8f41171 2019-02-10 stsp goto done;
1941 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1943 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1944 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1946 5036ab18 2020-04-18 stsp goto done;
1949 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1950 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1951 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1953 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1954 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1955 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1956 c6e8a826 2021-04-05 stsp * updating contents of this file.
1958 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1959 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1960 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1961 c6e8a826 2021-04-05 stsp /* Same commit. */
1962 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1963 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1965 e2b1e152 2019-07-13 stsp goto done;
1966 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1968 6353ad76 2019-02-08 stsp goto done;
1970 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1971 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1972 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1973 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1974 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1975 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1977 0f58026f 2021-04-05 stsp goto done;
1978 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1980 b8f41171 2019-02-10 stsp goto done;
1984 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1985 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1986 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1987 eb81bc23 2022-06-28 tracey goto done;
1989 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1991 6353ad76 2019-02-08 stsp goto done;
1993 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1994 234035bc 2019-06-01 stsp int update_timestamps;
1995 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1996 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1997 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1998 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
1999 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
2000 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
2001 eb81bc23 2022-06-28 tracey goto done;
2003 234035bc 2019-06-01 stsp struct got_object_id id2;
2004 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&id2, ie);
2005 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
2008 f69721c3 2019-10-21 stsp goto done;
2010 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
2011 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
2012 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
2013 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
2014 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
2015 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
2016 f69721c3 2019-10-21 stsp goto done;
2018 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2019 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2020 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2021 234035bc 2019-06-01 stsp goto done;
2024 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
2025 36bf999c 2020-07-23 stsp char *link_target;
2026 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
2028 36bf999c 2020-07-23 stsp goto done;
2029 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
2030 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
2031 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
2032 36bf999c 2020-07-23 stsp free(link_target);
2034 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
2035 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
2036 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
2037 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
2039 f69721c3 2019-10-21 stsp free(label_orig);
2040 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
2041 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
2042 eb81bc23 2022-06-28 tracey goto done;
2044 234035bc 2019-06-01 stsp if (blob2)
2045 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
2047 909d120e 2019-09-22 stsp goto done;
2049 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
2050 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
2051 234035bc 2019-06-01 stsp * unmodified files again.
2053 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2054 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
2055 234035bc 2019-06-01 stsp update_timestamps);
2056 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
2057 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2058 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2059 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
2060 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2062 1ee397ad 2019-07-12 stsp goto done;
2063 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2064 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2066 13d9040b 2019-03-27 stsp goto done;
2068 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2069 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
2070 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
2071 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2072 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2073 5267b9e4 2021-09-26 stsp status == GOT_STATUS_UNVERSIONED, 0,
2074 5267b9e4 2021-09-26 stsp repo, progress_cb, progress_arg);
2076 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2077 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2078 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2079 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2080 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2083 13d9040b 2019-03-27 stsp goto done;
2086 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2087 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2088 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2090 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2091 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2092 054041d0 2020-06-24 stsp &blob->id);
2095 13d9040b 2019-03-27 stsp goto done;
2097 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2098 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2099 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2103 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2104 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
2105 eb81bc23 2022-06-28 tracey goto done;
2107 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2109 6353ad76 2019-02-08 stsp free(ondisk_path);
2110 8da9e5f4 2019-01-12 stsp return err;
2113 90285c3b 2019-01-08 stsp static const struct got_error *
2114 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2116 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2117 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2119 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2120 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2122 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2123 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2124 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2126 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2127 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2129 1c4cdd89 2021-06-20 stsp goto done;
2130 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2131 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2132 fddefe3b 2020-10-20 stsp free(ondisk_path);
2133 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2134 1c4cdd89 2021-06-20 stsp parent = NULL;
2135 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2136 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2137 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2138 fddefe3b 2020-10-20 stsp ondisk_path);
2141 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2147 90285c3b 2019-01-08 stsp free(ondisk_path);
2148 1c4cdd89 2021-06-20 stsp free(parent);
2149 90285c3b 2019-01-08 stsp return err;
2152 708d8e67 2019-03-27 stsp static const struct got_error *
2153 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2154 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2155 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2157 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2158 708d8e67 2019-03-27 stsp unsigned char status;
2159 708d8e67 2019-03-27 stsp struct stat sb;
2160 708d8e67 2019-03-27 stsp char *ondisk_path;
2162 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2163 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2165 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2167 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2169 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2171 5a58a424 2020-06-23 stsp goto done;
2173 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2174 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2175 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2176 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2177 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2178 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2179 993e2a1b 2020-07-23 stsp goto done;
2181 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2182 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2183 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2184 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2186 993e2a1b 2020-07-23 stsp goto done;
2187 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2188 993e2a1b 2020-07-23 stsp ie->path);
2189 993e2a1b 2020-07-23 stsp goto done;
2192 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2193 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2194 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2196 5a58a424 2020-06-23 stsp goto done;
2198 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2199 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2201 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2202 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2204 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2206 5a58a424 2020-06-23 stsp goto done;
2207 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2208 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2210 5a58a424 2020-06-23 stsp goto done;
2212 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2215 5a58a424 2020-06-23 stsp free(ondisk_path);
2216 fc6346c4 2019-03-27 stsp return err;
2219 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2220 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2221 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2222 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2223 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2224 8da9e5f4 2019-01-12 stsp void *progress_arg;
2225 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2226 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2229 512f0d0e 2019-01-02 stsp static const struct got_error *
2230 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2231 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2233 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2235 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2236 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2238 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2239 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2242 8da9e5f4 2019-01-12 stsp static const struct got_error *
2243 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2245 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2247 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2248 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2250 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2251 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2254 9d31a1d8 2018-03-11 stsp static const struct got_error *
2255 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2257 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2258 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2259 8da9e5f4 2019-01-12 stsp char *path;
2261 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2262 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2264 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2265 63c5ca5d 2019-08-24 stsp return NULL;
2267 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2268 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2270 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2272 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2273 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2275 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2276 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2278 8da9e5f4 2019-01-12 stsp free(path);
2279 0cd1c46a 2019-03-11 stsp return err;
2282 b2118c49 2020-07-28 stsp const struct got_error *
2283 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2285 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2287 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2288 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2289 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2290 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2293 b2118c49 2020-07-28 stsp return NULL;
2296 818c7501 2019-07-11 stsp static const struct got_error *
2297 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2299 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2300 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2302 517bab73 2019-03-11 stsp *refname = NULL;
2304 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2306 b2118c49 2020-07-28 stsp return err;
2308 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2309 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2310 0647c563 2019-03-11 stsp *refname = NULL;
2312 517bab73 2019-03-11 stsp free(uuidstr);
2313 517bab73 2019-03-11 stsp return err;
2316 818c7501 2019-07-11 stsp const struct got_error *
2317 9587e6cc 2023-01-28 mark got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2318 9587e6cc 2023-01-28 mark const char *prefix)
2320 9587e6cc 2023-01-28 mark return get_ref_name(refname, worktree, prefix);
2323 9587e6cc 2023-01-28 mark const struct got_error *
2324 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2326 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2329 818c7501 2019-07-11 stsp static const struct got_error *
2330 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2332 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2333 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2336 818c7501 2019-07-11 stsp static const struct got_error *
2337 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2339 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2342 818c7501 2019-07-11 stsp static const struct got_error *
2343 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2345 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2346 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2349 818c7501 2019-07-11 stsp static const struct got_error *
2350 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2352 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2353 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2356 0ebf8283 2019-07-24 stsp static const struct got_error *
2357 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2359 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2360 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2363 0ebf8283 2019-07-24 stsp static const struct got_error *
2364 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2366 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2367 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2370 0ebf8283 2019-07-24 stsp static const struct got_error *
2371 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2373 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2374 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2377 0ebf8283 2019-07-24 stsp static const struct got_error *
2378 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2380 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2381 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2384 0ebf8283 2019-07-24 stsp const struct got_error *
2385 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2386 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2388 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2389 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2390 0ebf8283 2019-07-24 stsp *path = NULL;
2391 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2393 0ebf8283 2019-07-24 stsp return NULL;
2396 f259c4c1 2021-09-24 stsp static const struct got_error *
2397 f259c4c1 2021-09-24 stsp get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2399 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2400 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2403 f259c4c1 2021-09-24 stsp static const struct got_error *
2404 f259c4c1 2021-09-24 stsp get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2406 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2407 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2411 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2412 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2414 517bab73 2019-03-11 stsp static const struct got_error *
2415 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2417 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2418 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2419 517bab73 2019-03-11 stsp char *refname;
2421 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2423 517bab73 2019-03-11 stsp return err;
2425 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2427 0cd1c46a 2019-03-11 stsp goto done;
2429 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2431 0cd1c46a 2019-03-11 stsp free(refname);
2433 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2434 3e3a69f1 2019-07-25 stsp return err;
2437 3e3a69f1 2019-07-25 stsp static const struct got_error *
2438 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2440 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2442 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2443 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2444 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2445 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2447 9d31a1d8 2018-03-11 stsp return err;
2451 ebf99748 2019-05-09 stsp static const struct got_error *
2452 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2453 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2455 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2456 ebf99748 2019-05-09 stsp FILE *index = NULL;
2458 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2459 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2460 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2461 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2463 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2465 ebf99748 2019-05-09 stsp goto done;
2467 00fe21f2 2021-12-31 stsp index = fopen(*fileindex_path, "rbe");
2468 ebf99748 2019-05-09 stsp if (index == NULL) {
2469 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2470 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2472 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2473 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2474 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2477 ebf99748 2019-05-09 stsp if (err) {
2478 ebf99748 2019-05-09 stsp free(*fileindex_path);
2479 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2480 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2481 ebf99748 2019-05-09 stsp *fileindex = NULL;
2483 ebf99748 2019-05-09 stsp return err;
2486 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2487 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2488 c932eeeb 2019-05-22 stsp const char *path;
2489 c932eeeb 2019-05-22 stsp size_t path_len;
2490 c932eeeb 2019-05-22 stsp const char *entry_name;
2491 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2492 a484d721 2019-06-10 stsp void *progress_arg;
2495 c932eeeb 2019-05-22 stsp static const struct got_error *
2496 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2498 1ee397ad 2019-07-12 stsp const struct got_error *err;
2499 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2501 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2502 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2503 c932eeeb 2019-05-22 stsp return NULL;
2504 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2505 102ff934 2019-06-11 stsp return NULL;
2507 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2508 a769b60b 2021-06-27 stsp return NULL;
2510 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2511 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2512 c932eeeb 2019-05-22 stsp return NULL;
2514 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2515 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2516 edd02c5e 2019-07-11 stsp ie->path);
2518 1ee397ad 2019-07-12 stsp return err;
2520 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2521 c932eeeb 2019-05-22 stsp return NULL;
2524 b0a0c9ed 2023-02-06 op /* Bump base commit ID of all files within an updated part of the work tree. */
2525 a615e0e7 2020-12-16 stsp static const struct got_error *
2526 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2527 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2528 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2530 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2532 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2533 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2534 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2535 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2536 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2537 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2539 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2540 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2543 9c6338c4 2019-06-02 stsp static const struct got_error *
2544 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2546 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2547 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2548 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2549 867630bb 2020-01-17 stsp struct timespec timeout;
2551 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2552 b90054ed 2022-11-01 stsp fileindex_path, "");
2554 9c6338c4 2019-06-02 stsp goto done;
2556 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2558 9c6338c4 2019-06-02 stsp goto done;
2560 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2561 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2562 9c6338c4 2019-06-02 stsp fileindex_path);
2563 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2567 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2568 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2569 867630bb 2020-01-17 stsp * was recorded in the file index.
2571 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2572 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2573 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2575 9c6338c4 2019-06-02 stsp if (new_index)
2576 9c6338c4 2019-06-02 stsp fclose(new_index);
2577 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2578 9c6338c4 2019-06-02 stsp return err;
2581 6ced4176 2019-07-12 stsp static const struct got_error *
2582 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2583 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2584 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit, struct got_worktree *worktree,
2585 a44927cc 2022-04-07 stsp struct got_repository *repo)
2587 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2588 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2589 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2590 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2592 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2593 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2594 6ced4176 2019-07-12 stsp *tree_id = NULL;
2596 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2597 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2598 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2599 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2600 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2601 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2602 6ced4176 2019-07-12 stsp goto done;
2604 a44927cc 2022-04-07 stsp err = got_object_id_by_path(tree_id, repo, base_commit,
2605 a44927cc 2022-04-07 stsp worktree->path_prefix);
2607 6ced4176 2019-07-12 stsp goto done;
2608 6ced4176 2019-07-12 stsp return NULL;
2611 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2613 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2614 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2615 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2616 6ced4176 2019-07-12 stsp goto done;
2619 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2621 6ced4176 2019-07-12 stsp goto done;
2623 6ced4176 2019-07-12 stsp free(in_repo_path);
2624 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2626 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2628 6ced4176 2019-07-12 stsp goto done;
2630 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2631 6ced4176 2019-07-12 stsp /* Check out a single file. */
2632 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2633 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2634 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2635 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2636 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2637 6ced4176 2019-07-12 stsp goto done;
2639 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2640 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2641 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2642 6ced4176 2019-07-12 stsp goto done;
2645 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2646 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2648 6ced4176 2019-07-12 stsp return err;
2649 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2650 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2651 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2652 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2653 6ced4176 2019-07-12 stsp goto done;
2656 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2657 a44927cc 2022-04-07 stsp base_commit, in_repo_path);
2659 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2660 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2661 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2662 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2663 6ced4176 2019-07-12 stsp goto done;
2665 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2666 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2667 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2668 6ced4176 2019-07-12 stsp goto done;
2673 6ced4176 2019-07-12 stsp free(in_repo_path);
2674 6ced4176 2019-07-12 stsp if (err) {
2675 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2676 6ced4176 2019-07-12 stsp free(*tree_relpath);
2677 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2678 6ced4176 2019-07-12 stsp free(*tree_id);
2679 6ced4176 2019-07-12 stsp *tree_id = NULL;
2681 07ed472d 2019-07-12 stsp return err;
2684 07ed472d 2019-07-12 stsp static const struct got_error *
2685 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2686 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2687 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2688 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2690 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2691 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2692 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2693 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2694 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2696 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2697 7f47418f 2019-12-20 stsp if (err) {
2698 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2699 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2700 7f47418f 2019-12-20 stsp goto done;
2701 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2702 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2704 7f47418f 2019-12-20 stsp return err;
2707 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2708 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2710 07ed472d 2019-07-12 stsp goto done;
2712 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2714 07ed472d 2019-07-12 stsp goto done;
2716 07ed472d 2019-07-12 stsp if (entry_name &&
2717 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2718 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2719 07ed472d 2019-07-12 stsp goto done;
2722 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2723 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2724 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2725 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2726 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2727 07ed472d 2019-07-12 stsp arg.repo = repo;
2728 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2729 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2730 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2731 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2732 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2733 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2736 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2737 07ed472d 2019-07-12 stsp if (commit)
2738 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2739 6ced4176 2019-07-12 stsp return err;
2742 9d31a1d8 2018-03-11 stsp const struct got_error *
2743 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2744 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2745 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2746 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2748 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2749 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2750 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2751 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2752 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2753 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2754 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2755 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2756 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2757 f2ea84fa 2019-07-27 stsp int entry_type;
2758 f2ea84fa 2019-07-27 stsp char *relpath;
2759 f2ea84fa 2019-07-27 stsp char *entry_name;
2760 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2761 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2763 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2765 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2767 9d31a1d8 2018-03-11 stsp return err;
2769 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
2770 a44927cc 2022-04-07 stsp worktree->base_commit_id);
2772 a44927cc 2022-04-07 stsp goto done;
2774 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2775 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2776 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2777 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2778 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2779 f2ea84fa 2019-07-27 stsp goto done;
2782 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2783 a44927cc 2022-04-07 stsp &tpd->relpath, &tpd->tree_id, pe->path, commit,
2784 a44927cc 2022-04-07 stsp worktree, repo);
2785 f2ea84fa 2019-07-27 stsp if (err) {
2786 f2ea84fa 2019-07-27 stsp free(tpd);
2787 6ced4176 2019-07-12 stsp goto done;
2790 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2791 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2792 f2ea84fa 2019-07-27 stsp if (err) {
2793 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2794 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2795 f2ea84fa 2019-07-27 stsp free(tpd);
2796 f2ea84fa 2019-07-27 stsp goto done;
2799 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2801 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2805 51514078 2018-12-25 stsp * Read the file index.
2806 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2807 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2809 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2811 c4cdcb68 2019-04-03 stsp goto done;
2813 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2814 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2815 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2817 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2818 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2819 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2823 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2824 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2825 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2826 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2827 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2828 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2829 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2830 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2834 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2836 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2837 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2838 af12c6b9 2019-06-04 stsp err = sync_err;
2840 9c6338c4 2019-06-02 stsp free(fileindex_path);
2842 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2843 9d31a1d8 2018-03-11 stsp if (commit)
2844 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2845 5ade8233 2019-07-12 stsp if (fileindex)
2846 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2847 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2848 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2849 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2850 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2851 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2852 f2ea84fa 2019-07-27 stsp free(tpd);
2854 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2855 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2856 9d31a1d8 2018-03-11 stsp err = unlockerr;
2857 f8d1f275 2019-02-04 stsp return err;
2860 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2861 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2862 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2863 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2864 234035bc 2019-06-01 stsp void *progress_arg;
2865 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2866 234035bc 2019-06-01 stsp void *cancel_arg;
2867 f69721c3 2019-10-21 stsp const char *label_orig;
2868 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2869 5267b9e4 2021-09-26 stsp int allow_bad_symlinks;
2872 234035bc 2019-06-01 stsp static const struct got_error *
2873 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2874 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
2875 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
2876 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
2877 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2879 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2880 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2881 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2882 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2883 234035bc 2019-06-01 stsp struct stat sb;
2884 234035bc 2019-06-01 stsp unsigned char status;
2885 234035bc 2019-06-01 stsp int local_changes_subsumed;
2886 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2887 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2889 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2890 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2891 d6c87207 2019-08-02 stsp strlen(path2));
2892 1ee397ad 2019-07-12 stsp if (ie == NULL)
2893 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2894 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2896 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2897 234035bc 2019-06-01 stsp path2) == -1)
2898 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2900 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2903 234035bc 2019-06-01 stsp goto done;
2905 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2906 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2907 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2908 234035bc 2019-06-01 stsp goto done;
2910 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2911 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2912 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2913 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2914 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2915 234035bc 2019-06-01 stsp goto done;
2918 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2919 36bf999c 2020-07-23 stsp char *link_target2;
2920 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2922 36bf999c 2020-07-23 stsp goto done;
2923 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2924 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2925 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2926 36bf999c 2020-07-23 stsp free(link_target2);
2930 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2931 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2932 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2933 1af628f4 2021-06-03 stsp goto done;
2935 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2936 1af628f4 2021-06-03 stsp f_orig, blob1);
2938 1af628f4 2021-06-03 stsp goto done;
2940 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2941 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2942 1af628f4 2021-06-03 stsp goto done;
2943 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2944 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2946 1af628f4 2021-06-03 stsp goto done;
2948 c0df5966 2021-12-31 stsp fd = open(ondisk_path,
2949 c0df5966 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2950 1af628f4 2021-06-03 stsp if (fd == -1) {
2951 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2952 1af628f4 2021-06-03 stsp ondisk_path);
2953 1af628f4 2021-06-03 stsp goto done;
2955 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2956 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2957 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2958 1af628f4 2021-06-03 stsp ondisk_path);
2959 1af628f4 2021-06-03 stsp close(fd);
2960 1af628f4 2021-06-03 stsp goto done;
2962 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2964 1af628f4 2021-06-03 stsp goto done;
2965 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2966 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2967 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2968 1af628f4 2021-06-03 stsp goto done;
2970 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2971 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2972 c48f94a4 2023-01-29 stsp mode2, a->label_orig, NULL, label_deriv2,
2973 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2974 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2976 234035bc 2019-06-01 stsp } else if (blob1) {
2977 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2978 d6c87207 2019-08-02 stsp strlen(path1));
2979 1ee397ad 2019-07-12 stsp if (ie == NULL)
2980 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2981 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2983 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2984 2b92fad7 2019-06-02 stsp path1) == -1)
2985 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2987 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2990 2b92fad7 2019-06-02 stsp goto done;
2992 2b92fad7 2019-06-02 stsp switch (status) {
2993 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2994 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2995 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2997 1ee397ad 2019-07-12 stsp goto done;
2998 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
3000 2b92fad7 2019-06-02 stsp goto done;
3002 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3004 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
3005 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
3006 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3007 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
3009 1ee397ad 2019-07-12 stsp goto done;
3011 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3013 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
3014 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
3015 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
3016 72840534 2022-01-19 stsp off_t blob1_size;
3018 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
3019 0a22ca1a 2020-09-23 stsp * exists in the repository.
3021 72840534 2022-01-19 stsp err = got_object_blob_file_create(&id, &blob1_f,
3022 72840534 2022-01-19 stsp &blob1_size, path1);
3024 0a22ca1a 2020-09-23 stsp goto done;
3025 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
3026 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3027 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
3029 0a22ca1a 2020-09-23 stsp goto done;
3030 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
3033 0a22ca1a 2020-09-23 stsp goto done;
3035 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
3038 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3039 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
3041 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
3042 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
3045 0a22ca1a 2020-09-23 stsp goto done;
3048 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
3049 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
3050 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3051 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
3053 1ee397ad 2019-07-12 stsp goto done;
3055 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
3056 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
3058 1ee397ad 2019-07-12 stsp goto done;
3063 234035bc 2019-06-01 stsp } else if (blob2) {
3064 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3065 234035bc 2019-06-01 stsp path2) == -1)
3066 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3067 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
3068 d6c87207 2019-08-02 stsp strlen(path2));
3070 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
3071 7f91a133 2019-12-13 stsp -1, NULL, repo);
3073 234035bc 2019-06-01 stsp goto done;
3074 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3075 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3076 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3077 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3078 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3079 1ee397ad 2019-07-12 stsp status, path2);
3080 234035bc 2019-06-01 stsp goto done;
3082 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3083 36bf999c 2020-07-23 stsp char *link_target2;
3084 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3087 36bf999c 2020-07-23 stsp goto done;
3088 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3089 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3090 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3091 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3092 36bf999c 2020-07-23 stsp free(link_target2);
3093 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3094 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3095 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3096 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3097 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3098 526a746f 2020-07-23 stsp a->progress_arg);
3100 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3101 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3104 dfe9fba0 2020-07-23 stsp goto done;
3105 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3106 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3107 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3108 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3110 234035bc 2019-06-01 stsp goto done;
3113 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3114 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3115 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3116 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3117 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3118 5267b9e4 2021-09-26 stsp 0, 1, a->allow_bad_symlinks, repo,
3119 5267b9e4 2021-09-26 stsp a->progress_cb, a->progress_arg);
3121 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3122 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3123 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3126 234035bc 2019-06-01 stsp goto done;
3127 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3129 234035bc 2019-06-01 stsp goto done;
3130 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3131 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3132 3969253a 2020-03-07 stsp if (err) {
3133 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3134 3969253a 2020-03-07 stsp goto done;
3136 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3137 2b92fad7 2019-06-02 stsp if (err) {
3138 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3139 2b92fad7 2019-06-02 stsp goto done;
3141 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3142 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3143 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3148 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3149 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3150 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3151 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3152 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3153 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3154 1af628f4 2021-06-03 stsp free(id_str);
3155 54d5be07 2021-06-03 stsp free(label_deriv2);
3156 234035bc 2019-06-01 stsp free(ondisk_path);
3157 234035bc 2019-06-01 stsp return err;
3160 69de9dd4 2021-09-03 stsp static const struct got_error *
3161 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3163 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3165 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3166 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3167 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3168 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3169 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3171 69de9dd4 2021-09-03 stsp return NULL;
3174 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3175 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3176 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3177 234035bc 2019-06-01 stsp struct got_repository *repo;
3180 234035bc 2019-06-01 stsp static const struct got_error *
3181 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3182 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
3183 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
3184 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
3185 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3187 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3188 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3189 234035bc 2019-06-01 stsp unsigned char status;
3190 234035bc 2019-06-01 stsp struct stat sb;
3191 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3192 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3193 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3194 234035bc 2019-06-01 stsp char *ondisk_path;
3196 69de9dd4 2021-09-03 stsp if (id == NULL)
3197 69de9dd4 2021-09-03 stsp return NULL;
3199 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3200 69de9dd4 2021-09-03 stsp if (ie == NULL)
3201 69de9dd4 2021-09-03 stsp return NULL;
3203 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3205 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3207 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3208 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3209 5546d466 2021-09-02 stsp free(ondisk_path);
3211 234035bc 2019-06-01 stsp return err;
3212 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3213 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3215 234035bc 2019-06-01 stsp return NULL;
3218 818c7501 2019-07-11 stsp static const struct got_error *
3219 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3220 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3221 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3222 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3223 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3225 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3226 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3227 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3228 a44927cc 2022-04-07 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3229 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3230 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3231 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3232 b72706c3 2022-06-01 stsp FILE *f1 = NULL, *f2 = NULL;
3233 f9d37699 2022-06-28 stsp int fd1 = -1, fd2 = -1;
3235 03415a1a 2019-06-02 stsp if (commit_id1) {
3236 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit1, repo, commit_id1);
3238 a44927cc 2022-04-07 stsp goto done;
3239 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id1, repo, commit1,
3240 03415a1a 2019-06-02 stsp worktree->path_prefix);
3241 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3242 03415a1a 2019-06-02 stsp goto done;
3244 69d57f3d 2020-07-31 stsp if (tree_id1) {
3245 69d57f3d 2020-07-31 stsp char *id_str;
3247 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3249 03415a1a 2019-06-02 stsp goto done;
3251 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3253 f69721c3 2019-10-21 stsp goto done;
3255 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3256 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3257 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3258 f69721c3 2019-10-21 stsp free(id_str);
3259 f69721c3 2019-10-21 stsp goto done;
3261 f69721c3 2019-10-21 stsp free(id_str);
3263 b72706c3 2022-06-01 stsp f1 = got_opentemp();
3264 b72706c3 2022-06-01 stsp if (f1 == NULL) {
3265 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3266 b72706c3 2022-06-01 stsp goto done;
3270 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit2, repo, commit_id2);
3272 a44927cc 2022-04-07 stsp goto done;
3274 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id2, repo, commit2,
3275 234035bc 2019-06-01 stsp worktree->path_prefix);
3277 234035bc 2019-06-01 stsp goto done;
3279 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3281 234035bc 2019-06-01 stsp goto done;
3283 b72706c3 2022-06-01 stsp f2 = got_opentemp();
3284 b72706c3 2022-06-01 stsp if (f2 == NULL) {
3285 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3286 f9d37699 2022-06-28 stsp goto done;
3289 f9d37699 2022-06-28 stsp fd1 = got_opentempfd();
3290 f9d37699 2022-06-28 stsp if (fd1 == -1) {
3291 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3292 b72706c3 2022-06-01 stsp goto done;
3295 f9d37699 2022-06-28 stsp fd2 = got_opentempfd();
3296 f9d37699 2022-06-28 stsp if (fd2 == -1) {
3297 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3298 f9d37699 2022-06-28 stsp goto done;
3301 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3302 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3303 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3304 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3305 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3307 69de9dd4 2021-09-03 stsp goto done;
3309 234035bc 2019-06-01 stsp arg.worktree = worktree;
3310 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3311 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3312 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3313 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3314 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3315 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3316 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3317 5267b9e4 2021-09-26 stsp arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3318 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3319 b72706c3 2022-06-01 stsp merge_file_cb, &arg, 1);
3320 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3321 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3322 af12c6b9 2019-06-04 stsp err = sync_err;
3324 a44927cc 2022-04-07 stsp if (commit1)
3325 a44927cc 2022-04-07 stsp got_object_commit_close(commit1);
3326 a44927cc 2022-04-07 stsp if (commit2)
3327 a44927cc 2022-04-07 stsp got_object_commit_close(commit2);
3328 234035bc 2019-06-01 stsp if (tree1)
3329 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3330 234035bc 2019-06-01 stsp if (tree2)
3331 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3332 b72706c3 2022-06-01 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3333 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3334 b72706c3 2022-06-01 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3335 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3336 f9d37699 2022-06-28 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3337 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3338 f9d37699 2022-06-28 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3339 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3340 f69721c3 2019-10-21 stsp free(label_orig);
3341 818c7501 2019-07-11 stsp return err;
3344 818c7501 2019-07-11 stsp const struct got_error *
3345 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3346 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3347 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3348 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3350 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3351 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3352 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3354 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3356 818c7501 2019-07-11 stsp return err;
3358 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3360 818c7501 2019-07-11 stsp goto done;
3362 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3363 69de9dd4 2021-09-03 stsp worktree);
3365 818c7501 2019-07-11 stsp goto done;
3367 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3368 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3369 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3371 818c7501 2019-07-11 stsp if (fileindex)
3372 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3373 818c7501 2019-07-11 stsp free(fileindex_path);
3374 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3375 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3376 234035bc 2019-06-01 stsp err = unlockerr;
3377 234035bc 2019-06-01 stsp return err;
3380 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3381 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3382 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3383 927df6b7 2019-02-10 stsp const char *status_path;
3384 927df6b7 2019-02-10 stsp size_t status_path_len;
3385 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3386 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3387 f8d1f275 2019-02-04 stsp void *status_arg;
3388 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3389 f8d1f275 2019-02-04 stsp void *cancel_arg;
3390 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3391 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3392 f2a9dc41 2019-12-13 tracey int report_unchanged;
3393 3143d852 2020-06-25 stsp int no_ignores;
3396 f8d1f275 2019-02-04 stsp static const struct got_error *
3397 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3398 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3399 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3400 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3402 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3403 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3404 2c4740ad 2023-02-12 mark unsigned char staged_status;
3405 927df6b7 2019-02-10 stsp struct stat sb;
3406 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3407 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3408 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3410 2c4740ad 2023-02-12 mark staged_status = get_staged_status(ie);
3411 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3413 98eaaa12 2019-08-03 stsp return err;
3415 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3416 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3417 98eaaa12 2019-08-03 stsp return NULL;
3419 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_blob(ie))
3420 b4b2adf5 2023-02-09 op blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
3421 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_commit(ie))
3422 b4b2adf5 2023-02-09 op commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
3423 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3424 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3425 b4b2adf5 2023-02-09 op staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
3426 b4b2adf5 2023-02-09 op &staged_blob_id, ie);
3429 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3430 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3433 927df6b7 2019-02-10 stsp static const struct got_error *
3434 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3435 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3437 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3438 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3439 f8d1f275 2019-02-04 stsp char *abspath;
3441 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3442 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3444 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3445 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3446 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3447 927df6b7 2019-02-10 stsp return NULL;
3449 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3450 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3451 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3452 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3454 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3455 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3456 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3459 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3460 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3461 f8d1f275 2019-02-04 stsp free(abspath);
3462 9d31a1d8 2018-03-11 stsp return err;
3465 f8d1f275 2019-02-04 stsp static const struct got_error *
3466 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3468 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3469 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3470 2ec1f75b 2019-03-26 stsp unsigned char status;
3472 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3473 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3475 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3476 927df6b7 2019-02-10 stsp return NULL;
3478 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&blob_id, ie);
3479 b4b2adf5 2023-02-09 op got_fileindex_entry_get_commit_id(&commit_id, ie);
3480 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3481 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3483 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3484 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3485 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3489 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3491 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3493 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3494 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3496 d8bacb93 2023-01-10 mark got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3498 d8bacb93 2023-01-10 mark got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3501 6841da00 2019-08-08 stsp static const struct got_error *
3502 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3504 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3505 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3506 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3507 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3508 6841da00 2019-08-08 stsp size_t linesize = 0;
3509 6841da00 2019-08-08 stsp ssize_t linelen;
3511 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3512 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3513 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3514 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3516 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3517 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3518 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3520 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3521 bd8de430 2019-10-04 stsp if (line[0] == '#')
3524 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3525 bd8de430 2019-10-04 stsp if (line[0] == '!')
3528 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3529 6841da00 2019-08-08 stsp line) == -1) {
3530 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3531 6841da00 2019-08-08 stsp goto done;
3533 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3535 6841da00 2019-08-08 stsp goto done;
3537 6841da00 2019-08-08 stsp if (ferror(f)) {
3538 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3539 6841da00 2019-08-08 stsp goto done;
3542 6841da00 2019-08-08 stsp dirpath = strdup(path);
3543 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3544 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3545 6841da00 2019-08-08 stsp goto done;
3547 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3549 6841da00 2019-08-08 stsp free(line);
3550 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3551 6841da00 2019-08-08 stsp free(dirpath);
3552 d8bacb93 2023-01-10 mark got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3554 6841da00 2019-08-08 stsp return err;
3558 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3560 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3562 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3563 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3564 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3565 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3567 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3568 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3570 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3572 bd8de430 2019-10-04 stsp pattern += 3;
3574 bd8de430 2019-10-04 stsp while (*p) {
3575 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3576 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3577 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3578 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3580 bd8de430 2019-10-04 stsp while (*p == '/')
3590 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3591 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3592 6841da00 2019-08-08 stsp * ignores backwards.
3594 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3595 6841da00 2019-08-08 stsp while (pe) {
3596 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3597 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3598 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3599 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3600 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3601 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3602 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3603 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3604 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3609 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3615 6841da00 2019-08-08 stsp static const struct got_error *
3616 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3617 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3619 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3620 6841da00 2019-08-08 stsp char *ignorespath;
3621 886cec17 2019-12-15 stsp int fd = -1;
3622 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3624 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3625 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3626 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3628 886cec17 2019-12-15 stsp if (dirfd != -1) {
3629 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, ignores_filename,
3630 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3631 886cec17 2019-12-15 stsp if (fd == -1) {
3632 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3633 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3634 886cec17 2019-12-15 stsp ignorespath);
3636 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3637 5e91dae4 2022-08-30 stsp if (ignoresfile == NULL)
3638 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3639 886cec17 2019-12-15 stsp ignorespath);
3642 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3646 00fe21f2 2021-12-31 stsp ignoresfile = fopen(ignorespath, "re");
3647 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3648 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3649 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3650 886cec17 2019-12-15 stsp ignorespath);
3652 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3655 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3656 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3657 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3658 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3659 6841da00 2019-08-08 stsp free(ignorespath);
3660 6841da00 2019-08-08 stsp return err;
3663 f8d1f275 2019-02-04 stsp static const struct got_error *
3664 62da3196 2021-10-01 stsp status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3665 62da3196 2021-10-01 stsp int dirfd)
3667 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3668 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3669 f8d1f275 2019-02-04 stsp char *path = NULL;
3671 62da3196 2021-10-01 stsp if (ignore != NULL)
3672 62da3196 2021-10-01 stsp *ignore = 0;
3674 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3675 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3677 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3678 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3679 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3681 f8d1f275 2019-02-04 stsp path = de->d_name;
3684 62da3196 2021-10-01 stsp if (de->d_type == DT_DIR) {
3685 62da3196 2021-10-01 stsp if (!a->no_ignores && ignore != NULL &&
3686 62da3196 2021-10-01 stsp match_ignores(a->ignores, path))
3687 62da3196 2021-10-01 stsp *ignore = 1;
3688 62da3196 2021-10-01 stsp } else if (!match_ignores(a->ignores, path) &&
3689 62da3196 2021-10-01 stsp got_path_is_child(path, a->status_path, a->status_path_len))
3690 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3691 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3692 f8d1f275 2019-02-04 stsp if (parent_path[0])
3693 f8d1f275 2019-02-04 stsp free(path);
3694 b72f483a 2019-02-05 stsp return err;
3697 347d1d3e 2019-07-12 stsp static const struct got_error *
3698 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3700 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3701 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3703 3143d852 2020-06-25 stsp if (a->no_ignores)
3704 3143d852 2020-06-25 stsp return NULL;
3706 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3707 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3709 3143d852 2020-06-25 stsp return err;
3711 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3712 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3714 3143d852 2020-06-25 stsp return err;
3717 3143d852 2020-06-25 stsp static const struct got_error *
3718 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3719 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3720 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3721 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3723 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3724 abb4604f 2019-07-27 stsp struct stat sb;
3726 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3728 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3729 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3731 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3732 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3733 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3734 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3735 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3738 916237f3 2022-02-11 stsp if (!no_ignores && match_ignores(ignores, path))
3739 916237f3 2022-02-11 stsp return NULL;
3741 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3742 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3743 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3745 abb4604f 2019-07-27 stsp return NULL;
3748 3143d852 2020-06-25 stsp static const struct got_error *
3749 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3750 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3752 3143d852 2020-06-25 stsp const struct got_error *err;
3753 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3755 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3756 3143d852 2020-06-25 stsp ".cvsignore");
3758 3143d852 2020-06-25 stsp return err;
3760 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3761 3143d852 2020-06-25 stsp ".gitignore");
3763 3143d852 2020-06-25 stsp return err;
3765 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3766 3143d852 2020-06-25 stsp if (err) {
3767 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3768 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3769 3143d852 2020-06-25 stsp return err;
3771 3143d852 2020-06-25 stsp for (;;) {
3772 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3773 3143d852 2020-06-25 stsp ".cvsignore");
3776 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3777 3143d852 2020-06-25 stsp ".gitignore");
3780 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3781 3143d852 2020-06-25 stsp if (err) {
3782 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3783 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3786 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3788 b737c85a 2020-06-26 stsp free(parent_path);
3789 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3790 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3793 b737c85a 2020-06-26 stsp free(parent_path);
3794 b737c85a 2020-06-26 stsp free(next_parent_path);
3795 3143d852 2020-06-25 stsp return err;
3798 abb4604f 2019-07-27 stsp static const struct got_error *
3799 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3800 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3801 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3802 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3803 f2a9dc41 2019-12-13 tracey int report_unchanged)
3805 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3806 6fc93f37 2019-12-13 stsp int fd = -1;
3807 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3808 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3809 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3810 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3811 a84c0d30 2022-03-12 stsp struct got_fileindex_entry *ie;
3813 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3815 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3816 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3817 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3819 a84c0d30 2022-03-12 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3821 a84c0d30 2022-03-12 stsp err = report_single_file_status(path, ondisk_path,
3822 a84c0d30 2022-03-12 stsp fileindex, status_cb, status_arg, repo,
3823 a84c0d30 2022-03-12 stsp report_unchanged, &ignores, no_ignores);
3824 a84c0d30 2022-03-12 stsp goto done;
3827 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3828 6fc93f37 2019-12-13 stsp if (fd == -1) {
3829 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3830 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
3831 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3833 ff56836b 2021-07-08 stsp if (!no_ignores) {
3834 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3835 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3837 ff56836b 2021-07-08 stsp goto done;
3839 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3840 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3841 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3844 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3845 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3846 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3847 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3848 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3849 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3850 abb4604f 2019-07-27 stsp arg.status_path = path;
3851 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3852 abb4604f 2019-07-27 stsp arg.repo = repo;
3853 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3854 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3855 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3856 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3857 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3858 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3859 022fae89 2019-12-06 tracey if (!no_ignores) {
3860 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3861 3143d852 2020-06-25 stsp worktree->root_path, path);
3863 3143d852 2020-06-25 stsp goto done;
3865 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3866 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3867 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3870 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3871 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3872 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3873 927df6b7 2019-02-10 stsp free(ondisk_path);
3874 347d1d3e 2019-07-12 stsp return err;
3877 347d1d3e 2019-07-12 stsp const struct got_error *
3878 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3879 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3880 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3881 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3883 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3884 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3885 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3886 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3888 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3890 347d1d3e 2019-07-12 stsp return err;
3892 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3893 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3894 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3895 f6343036 2021-06-22 stsp no_ignores, 0);
3899 f8d1f275 2019-02-04 stsp free(fileindex_path);
3900 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3901 f8d1f275 2019-02-04 stsp return err;
3904 6c7ab921 2019-03-18 stsp const struct got_error *
3905 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3906 6c7ab921 2019-03-18 stsp const char *arg)
3908 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3909 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3910 6c7ab921 2019-03-18 stsp size_t len;
3911 00bb5ea0 2020-07-23 stsp struct stat sb;
3912 01740607 2020-11-04 stsp char *abspath = NULL;
3913 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3915 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3917 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3918 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3919 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3921 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3922 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3923 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3924 00bb5ea0 2020-07-23 stsp goto done;
3926 727173c3 2020-11-06 stsp sb.st_mode = 0;
3928 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3930 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3931 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3932 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3933 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3935 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3936 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3937 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3938 00bb5ea0 2020-07-23 stsp goto done;
3942 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3943 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3945 d0710d08 2019-07-22 stsp goto done;
3946 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3947 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3948 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3949 00bb5ea0 2020-07-23 stsp goto done;
3952 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3953 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3954 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3955 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3956 00bb5ea0 2020-07-23 stsp goto done;
3958 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3959 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3960 01740607 2020-11-04 stsp goto done;
3962 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3963 01740607 2020-11-04 stsp sizeof(canonpath));
3965 00bb5ea0 2020-07-23 stsp goto done;
3966 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3967 01740607 2020-11-04 stsp if (resolved == NULL) {
3968 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3969 01740607 2020-11-04 stsp goto done;
3974 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3975 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3976 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3977 6c7ab921 2019-03-18 stsp goto done;
3980 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3981 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3982 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3984 f6d88e1a 2019-05-29 stsp goto done;
3986 f6d88e1a 2019-05-29 stsp path = strdup("");
3987 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3988 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3989 f6d88e1a 2019-05-29 stsp goto done;
3993 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3994 6c7ab921 2019-03-18 stsp len = strlen(path);
3995 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3996 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
4000 01740607 2020-11-04 stsp free(abspath);
4001 6c7ab921 2019-03-18 stsp free(resolved);
4002 d0710d08 2019-07-22 stsp free(cwd);
4003 6c7ab921 2019-03-18 stsp if (err == NULL)
4004 6c7ab921 2019-03-18 stsp *wt_path = path;
4006 6c7ab921 2019-03-18 stsp free(path);
4007 d00136be 2019-03-26 stsp return err;
4010 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
4011 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
4012 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
4013 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
4014 4e68cba3 2019-11-23 stsp void *progress_arg;
4015 4e68cba3 2019-11-23 stsp struct got_repository *repo;
4018 4e68cba3 2019-11-23 stsp static const struct got_error *
4019 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
4020 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
4021 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4022 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4024 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
4025 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
4026 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
4027 6d022e97 2019-08-04 stsp struct stat sb;
4028 dbb83fbd 2019-12-12 stsp char *ondisk_path;
4030 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4031 dbb83fbd 2019-12-12 stsp relpath) == -1)
4032 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
4034 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4036 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
4037 12463d8b 2019-12-13 stsp de_name, a->repo);
4039 dbb83fbd 2019-12-12 stsp goto done;
4040 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
4041 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
4042 dbb83fbd 2019-12-12 stsp goto done;
4043 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4045 dbb83fbd 2019-12-12 stsp goto done;
4048 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
4049 9b4603c0 2022-01-31 stsp if (status == GOT_STATUS_NONEXISTENT)
4050 9b4603c0 2022-01-31 stsp err = got_error_set_errno(ENOENT, ondisk_path);
4052 9b4603c0 2022-01-31 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
4053 dbb83fbd 2019-12-12 stsp goto done;
4056 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
4058 4e68cba3 2019-11-23 stsp goto done;
4059 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
4060 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
4061 3969253a 2020-03-07 stsp if (err) {
4062 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4063 3969253a 2020-03-07 stsp goto done;
4065 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
4066 07f5b47a 2019-06-02 stsp if (err) {
4067 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
4068 4e68cba3 2019-11-23 stsp goto done;
4071 dbb83fbd 2019-12-12 stsp free(ondisk_path);
4073 dbb83fbd 2019-12-12 stsp return err;
4074 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
4075 dbb83fbd 2019-12-12 stsp return NULL;
4076 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4079 d00136be 2019-03-26 stsp const struct got_error *
4080 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4081 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4082 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4083 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4085 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4086 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4087 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4088 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4089 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4091 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4093 d00136be 2019-03-26 stsp return err;
4095 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4097 d00136be 2019-03-26 stsp goto done;
4099 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4100 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4101 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4102 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4103 4e68cba3 2019-11-23 stsp saa.repo = repo;
4105 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4106 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4107 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4111 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4112 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4113 af12c6b9 2019-06-04 stsp err = sync_err;
4115 fb399478 2019-07-12 stsp free(fileindex_path);
4116 d00136be 2019-03-26 stsp if (fileindex)
4117 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4118 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4119 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4120 d00136be 2019-03-26 stsp err = unlockerr;
4121 6c7ab921 2019-03-18 stsp return err;
4124 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4125 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4126 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4127 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4128 f2a9dc41 2019-12-13 tracey void *progress_arg;
4129 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4130 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4131 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4132 4e12cd97 2022-01-25 stsp int ignore_missing_paths;
4133 766841c2 2020-08-13 stsp const char *status_codes;
4136 f2a9dc41 2019-12-13 tracey static const struct got_error *
4137 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4138 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4139 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4140 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4142 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4143 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4144 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4145 17ed4618 2019-06-02 stsp struct stat sb;
4146 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4148 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_NONEXISTENT) {
4149 4e12cd97 2022-01-25 stsp if (a->ignore_missing_paths)
4150 4e12cd97 2022-01-25 stsp return NULL;
4151 4e12cd97 2022-01-25 stsp return got_error_set_errno(ENOENT, relpath);
4154 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4155 17ed4618 2019-06-02 stsp if (ie == NULL)
4156 692bdcc4 2022-01-25 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4158 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4159 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4160 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4161 9acbc4fa 2019-08-03 stsp return NULL;
4162 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4165 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4166 f2a9dc41 2019-12-13 tracey relpath) == -1)
4167 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4169 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4172 f2a9dc41 2019-12-13 tracey goto done;
4174 766841c2 2020-08-13 stsp if (a->status_codes) {
4175 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4177 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4178 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4181 5e91dae4 2022-08-30 stsp if (i == ncodes) {
4182 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4183 766841c2 2020-08-13 stsp free(ondisk_path);
4184 766841c2 2020-08-13 stsp return NULL;
4186 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4187 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4188 766841c2 2020-08-13 stsp static char msg[64];
4189 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4190 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4191 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4192 766841c2 2020-08-13 stsp goto done;
4196 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4197 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4198 f2a9dc41 2019-12-13 tracey goto done;
4199 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4200 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4201 f2a9dc41 2019-12-13 tracey goto done;
4203 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4204 4e12cd97 2022-01-25 stsp err = got_error_set_errno(ENOENT, relpath);
4205 4e12cd97 2022-01-25 stsp goto done;
4207 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4208 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4209 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4210 f2a9dc41 2019-12-13 tracey goto done;
4214 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4215 20a2ad1c 2020-10-20 stsp size_t root_len;
4217 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4218 a06ca3f7 2022-10-15 stsp if (unlinkat(dirfd, de_name, 0) == -1) {
4219 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4220 12463d8b 2019-12-13 stsp ondisk_path);
4221 12463d8b 2019-12-13 stsp goto done;
4223 a06ca3f7 2022-10-15 stsp } else if (unlink(ondisk_path) == -1) {
4224 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4225 12463d8b 2019-12-13 stsp goto done;
4228 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4230 20a2ad1c 2020-10-20 stsp char *parent;
4231 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4233 2513f20a 2020-10-20 stsp goto done;
4234 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4235 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4236 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4237 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4238 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4239 20a2ad1c 2020-10-20 stsp ondisk_path);
4242 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4243 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4246 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4248 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4249 f2a9dc41 2019-12-13 tracey if (err)
4250 f2a9dc41 2019-12-13 tracey return err;
4251 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4252 f2a9dc41 2019-12-13 tracey return NULL;
4253 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4254 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4257 2ec1f75b 2019-03-26 stsp const struct got_error *
4258 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4259 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4260 766841c2 2020-08-13 stsp const char *status_codes,
4261 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4262 4e12cd97 2022-01-25 stsp struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4264 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4265 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4266 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4267 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4268 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4270 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4272 2ec1f75b 2019-03-26 stsp return err;
4274 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4276 2ec1f75b 2019-03-26 stsp goto done;
4278 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4279 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4280 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4281 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4282 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4283 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4284 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4285 4e12cd97 2022-01-25 stsp sda.ignore_missing_paths = ignore_missing_paths;
4286 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4288 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4289 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4290 62da3196 2021-10-01 stsp schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4294 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4295 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4296 af12c6b9 2019-06-04 stsp err = sync_err;
4298 fb399478 2019-07-12 stsp free(fileindex_path);
4299 2ec1f75b 2019-03-26 stsp if (fileindex)
4300 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4301 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4302 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4303 2ec1f75b 2019-03-26 stsp err = unlockerr;
4304 33aa809d 2019-08-08 stsp return err;
4307 33aa809d 2019-08-08 stsp static const struct got_error *
4308 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4310 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4311 33aa809d 2019-08-08 stsp char *line = NULL;
4312 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4313 33aa809d 2019-08-08 stsp ssize_t linelen;
4315 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4316 33aa809d 2019-08-08 stsp if (linelen == -1) {
4317 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4318 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4319 33aa809d 2019-08-08 stsp goto done;
4321 33aa809d 2019-08-08 stsp return NULL;
4323 33aa809d 2019-08-08 stsp if (outfile) {
4324 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4325 33aa809d 2019-08-08 stsp if (n != linelen) {
4326 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4327 33aa809d 2019-08-08 stsp goto done;
4330 33aa809d 2019-08-08 stsp if (rejectfile) {
4331 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4332 33aa809d 2019-08-08 stsp if (n != linelen)
4333 910d235d 2023-01-10 mark err = got_ferror(rejectfile, GOT_ERR_IO);
4336 33aa809d 2019-08-08 stsp free(line);
4337 2ec1f75b 2019-03-26 stsp return err;
4340 33aa809d 2019-08-08 stsp static const struct got_error *
4341 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4343 33aa809d 2019-08-08 stsp char *line = NULL;
4344 33aa809d 2019-08-08 stsp size_t linesize = 0;
4345 33aa809d 2019-08-08 stsp ssize_t linelen;
4347 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4348 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4349 500467ff 2019-09-25 hiltjo if (ferror(f))
4350 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4351 500467ff 2019-09-25 hiltjo return NULL;
4353 33aa809d 2019-08-08 stsp free(line);
4354 33aa809d 2019-08-08 stsp return NULL;
4357 33aa809d 2019-08-08 stsp static const struct got_error *
4358 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4359 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4360 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4362 33aa809d 2019-08-08 stsp const struct got_error *err;
4364 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4365 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4366 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4368 33aa809d 2019-08-08 stsp return err;
4369 33aa809d 2019-08-08 stsp (*line_cur1)++;
4371 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4372 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4373 33aa809d 2019-08-08 stsp if (rejectfile)
4374 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4376 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4378 33aa809d 2019-08-08 stsp return err;
4379 33aa809d 2019-08-08 stsp (*line_cur2)++;
4381 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4382 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4383 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4385 33aa809d 2019-08-08 stsp return err;
4386 33aa809d 2019-08-08 stsp (*line_cur2)++;
4388 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4389 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4390 33aa809d 2019-08-08 stsp if (rejectfile)
4391 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4393 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4395 33aa809d 2019-08-08 stsp return err;
4396 33aa809d 2019-08-08 stsp (*line_cur1)++;
4399 f1e81a05 2019-08-10 stsp return NULL;
4402 f1e81a05 2019-08-10 stsp static const struct got_error *
4403 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4404 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4406 f1e81a05 2019-08-10 stsp const struct got_error *err;
4408 f1e81a05 2019-08-10 stsp if (outfile) {
4409 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4410 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4411 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4413 f1e81a05 2019-08-10 stsp return err;
4414 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4417 f1e81a05 2019-08-10 stsp if (rejectfile) {
4418 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4419 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4420 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4422 f1e81a05 2019-08-10 stsp return err;
4423 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4427 33aa809d 2019-08-08 stsp return NULL;
4430 33aa809d 2019-08-08 stsp static const struct got_error *
4431 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4432 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4433 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4434 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4435 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4437 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4438 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4439 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4440 33aa809d 2019-08-08 stsp FILE *hunkfile;
4441 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4442 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4445 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4447 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4448 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4449 fe621944 2020-11-10 stsp start_old = cc.left.start;
4450 fe621944 2020-11-10 stsp end_old = cc.left.end;
4451 fe621944 2020-11-10 stsp start_new = cc.right.start;
4452 fe621944 2020-11-10 stsp end_new = cc.right.end;
4454 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4455 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4456 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4458 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4459 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4460 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4462 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4463 fe621944 2020-11-10 stsp if (diff_state == NULL)
4464 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4465 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4467 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4468 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4469 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4470 33aa809d 2019-08-08 stsp goto done;
4473 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4474 fe621944 2020-11-10 stsp diff_result, &cc);
4475 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4476 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4477 33aa809d 2019-08-08 stsp goto done;
4480 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4481 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4482 33aa809d 2019-08-08 stsp goto done;
4485 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4486 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4488 33aa809d 2019-08-08 stsp goto done;
4490 33aa809d 2019-08-08 stsp switch (*choice) {
4491 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4492 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4493 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4495 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4496 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4497 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4499 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4502 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4506 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4507 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4508 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4509 33aa809d 2019-08-08 stsp return err;
4512 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4513 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4514 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4515 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4516 1f1abb7e 2019-08-08 stsp void *progress_arg;
4517 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4518 33aa809d 2019-08-08 stsp void *patch_arg;
4519 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4520 f259c4c1 2021-09-24 stsp int unlink_added_files;
4523 e20a8b6f 2019-06-04 stsp static const struct got_error *
4524 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4525 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4526 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4527 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4528 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4530 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4531 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4532 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4533 eb81bc23 2022-06-28 tracey int fd = -1, fd2 = -1;
4534 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4535 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4536 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4537 fe621944 2020-11-10 stsp struct stat sb2;
4538 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4539 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4540 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4542 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4544 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4546 33aa809d 2019-08-08 stsp return err;
4548 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4549 e7ae0baf 2021-12-31 stsp fd2 = openat(dirfd2, de_name2,
4550 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4551 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4552 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4553 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4554 fa3cef63 2020-07-23 stsp goto done;
4556 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4557 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4558 c0df5966 2021-12-31 stsp if (link_len == -1) {
4559 c0df5966 2021-12-31 stsp return got_error_from_errno2("readlinkat",
4562 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4563 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4566 8bd0cdad 2021-12-31 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4567 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4568 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4569 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4570 fa3cef63 2020-07-23 stsp goto done;
4572 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4573 fa3cef63 2020-07-23 stsp sizeof(link_target));
4574 fa3cef63 2020-07-23 stsp if (link_len == -1)
4575 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4576 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4577 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4580 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4581 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4582 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4583 fa3cef63 2020-07-23 stsp goto done;
4586 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4587 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4588 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4589 fa3cef63 2020-07-23 stsp goto done;
4594 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4595 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4596 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4597 fa3cef63 2020-07-23 stsp goto done;
4599 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4600 fa3cef63 2020-07-23 stsp if (n != link_len) {
4601 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4602 fa3cef63 2020-07-23 stsp goto done;
4604 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4605 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4606 fa3cef63 2020-07-23 stsp goto done;
4608 fa3cef63 2020-07-23 stsp rewind(f2);
4611 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4612 eb81bc23 2022-06-28 tracey if (fd == -1) {
4613 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4614 eb81bc23 2022-06-28 tracey goto done;
4617 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4619 33aa809d 2019-08-08 stsp goto done;
4621 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4623 33aa809d 2019-08-08 stsp goto done;
4625 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4627 33aa809d 2019-08-08 stsp goto done;
4629 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4630 4b752015 2022-06-30 stsp 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4632 33aa809d 2019-08-08 stsp goto done;
4634 b90054ed 2022-11-01 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4637 33aa809d 2019-08-08 stsp goto done;
4639 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4640 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4641 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4642 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4644 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4645 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4646 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4647 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4648 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4649 fe621944 2020-11-10 stsp nchanges++;
4651 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4652 33aa809d 2019-08-08 stsp int choice;
4653 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4654 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4655 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4656 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4657 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4658 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4660 33aa809d 2019-08-08 stsp goto done;
4661 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4662 33aa809d 2019-08-08 stsp have_content = 1;
4663 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4666 1ebedb77 2019-10-19 stsp if (have_content) {
4667 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4668 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4669 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4671 1ebedb77 2019-10-19 stsp goto done;
4673 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4674 b2b3fce1 2022-10-29 op mode_t mode;
4676 b2b3fce1 2022-10-29 op mode = apply_umask(sb2.st_mode);
4677 b2b3fce1 2022-10-29 op if (fchmod(fileno(outfile), mode) == -1) {
4678 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4679 fa3cef63 2020-07-23 stsp goto done;
4684 33aa809d 2019-08-08 stsp free(id_str);
4685 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4686 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4688 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4689 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4690 fe621944 2020-11-10 stsp if (err == NULL)
4691 fe621944 2020-11-10 stsp err = free_err;
4692 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4693 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4694 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4695 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4696 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4697 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4698 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4699 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4700 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4701 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4702 33aa809d 2019-08-08 stsp if (err || !have_content) {
4703 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4704 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4705 33aa809d 2019-08-08 stsp free(*path_outfile);
4706 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4708 33aa809d 2019-08-08 stsp free(path1);
4709 33aa809d 2019-08-08 stsp return err;
4712 33aa809d 2019-08-08 stsp static const struct got_error *
4713 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4714 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4715 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4716 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4718 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4719 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4720 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4721 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4722 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit = NULL;
4723 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4724 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4725 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4726 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4727 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4728 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4729 eb81bc23 2022-06-28 tracey int fd = -1;
4731 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4732 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4733 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4734 d3bcc3d1 2019-08-08 stsp return NULL;
4736 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4737 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4738 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4740 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4741 65084dad 2019-08-08 stsp if (ie == NULL)
4742 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4744 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4745 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4746 a129376b 2019-03-28 stsp if (err) {
4747 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4748 a129376b 2019-03-28 stsp goto done;
4749 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4750 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4751 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4752 e20a8b6f 2019-06-04 stsp goto done;
4755 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4756 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4757 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4758 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4759 a129376b 2019-03-28 stsp goto done;
4762 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4763 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4764 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4765 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4766 a129376b 2019-03-28 stsp goto done;
4769 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4770 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4771 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4772 a129376b 2019-03-28 stsp goto done;
4777 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&base_commit, a->repo,
4778 a44927cc 2022-04-07 stsp a->worktree->base_commit_id);
4780 a44927cc 2022-04-07 stsp goto done;
4782 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4783 a9fa2909 2019-07-27 stsp if (err) {
4784 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4785 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4786 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4787 a9fa2909 2019-07-27 stsp goto done;
4789 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4791 a9fa2909 2019-07-27 stsp goto done;
4793 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4795 a9fa2909 2019-07-27 stsp goto done;
4797 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4798 1233e6b6 2020-10-19 stsp free(te_name);
4799 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4800 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4801 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4802 a9fa2909 2019-07-27 stsp goto done;
4806 a129376b 2019-03-28 stsp switch (status) {
4807 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4808 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4809 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4810 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4811 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4813 33aa809d 2019-08-08 stsp goto done;
4814 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4817 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4818 1f1abb7e 2019-08-08 stsp ie->path);
4820 1ee397ad 2019-07-12 stsp goto done;
4821 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4822 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4823 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4824 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4825 f259c4c1 2021-09-24 stsp relpath) == -1) {
4826 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4827 f259c4c1 2021-09-24 stsp goto done;
4829 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4830 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4831 f259c4c1 2021-09-24 stsp ondisk_path);
4836 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4837 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4838 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4839 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4840 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4842 33aa809d 2019-08-08 stsp goto done;
4843 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4846 33aa809d 2019-08-08 stsp /* fall through */
4847 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4848 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4849 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4850 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4851 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4852 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4853 b4b2adf5 2023-02-09 op staged_status == GOT_STATUS_MODIFY)
4854 b4b2adf5 2023-02-09 op got_fileindex_entry_get_staged_blob_id(&id, ie);
4856 b4b2adf5 2023-02-09 op got_fileindex_entry_get_blob_id(&id, ie);
4857 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4858 eb81bc23 2022-06-28 tracey if (fd == -1) {
4859 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4860 eb81bc23 2022-06-28 tracey goto done;
4863 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4865 65084dad 2019-08-08 stsp goto done;
4867 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4868 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4869 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4870 a129376b 2019-03-28 stsp goto done;
4873 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4874 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4875 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4876 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4877 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4878 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4879 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4881 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4882 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4883 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4884 369fd7e5 2020-07-23 stsp path_content);
4887 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4888 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4889 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4890 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4892 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4893 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4894 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4895 369fd7e5 2020-07-23 stsp goto done;
4899 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4900 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4901 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4902 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4903 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4904 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4906 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4908 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4909 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4910 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4911 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4914 a129376b 2019-03-28 stsp goto done;
4915 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4916 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4917 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4918 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4919 437adc9d 2020-12-10 yzhong blob->id.sha1,
4920 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4922 2e1fa222 2020-07-23 stsp goto done;
4924 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4925 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4926 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4935 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4936 33aa809d 2019-08-08 stsp free(path_content);
4937 e20a8b6f 2019-06-04 stsp free(parent_path);
4938 a129376b 2019-03-28 stsp free(tree_path);
4939 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4940 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4942 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4944 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4945 a129376b 2019-03-28 stsp free(tree_id);
4946 a44927cc 2022-04-07 stsp if (base_commit)
4947 a44927cc 2022-04-07 stsp got_object_commit_close(base_commit);
4948 e20a8b6f 2019-06-04 stsp return err;
4951 e20a8b6f 2019-06-04 stsp const struct got_error *
4952 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4953 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4954 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4955 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4956 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4958 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4959 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4960 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4961 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4962 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4963 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4965 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4967 e20a8b6f 2019-06-04 stsp return err;
4969 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4971 e20a8b6f 2019-06-04 stsp goto done;
4973 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4974 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4975 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4976 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4977 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4978 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4979 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4980 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4981 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4982 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4983 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
4987 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4988 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4989 e20a8b6f 2019-06-04 stsp err = sync_err;
4991 fb399478 2019-07-12 stsp free(fileindex_path);
4992 a129376b 2019-03-28 stsp if (fileindex)
4993 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4994 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4995 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4996 a129376b 2019-03-28 stsp err = unlockerr;
4997 c4296144 2019-05-09 stsp return err;
5000 cf066bf8 2019-05-09 stsp static void
5001 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
5003 24519714 2019-05-09 stsp free(ct->path);
5004 44d03001 2019-05-09 stsp free(ct->in_repo_path);
5005 768aea60 2019-05-09 stsp free(ct->ondisk_path);
5006 e75eb4da 2019-05-10 stsp free(ct->blob_id);
5007 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
5008 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
5009 b416585c 2019-05-13 stsp free(ct->base_commit_id);
5013 ed175427 2019-05-09 stsp struct collect_commitables_arg {
5014 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
5015 24519714 2019-05-09 stsp struct got_repository *repo;
5016 24519714 2019-05-09 stsp struct got_worktree *worktree;
5017 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
5018 5f8a88c6 2019-08-03 stsp int have_staged_files;
5019 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
5020 2a47b1e5 2022-11-01 stsp int diff_header_shown;
5021 12383673 2023-02-18 mark int commit_conflicts;
5022 2a47b1e5 2022-11-01 stsp FILE *diff_outfile;
5028 2a47b1e5 2022-11-01 stsp * Create a file which contains the target path of a symlink so we can feed
5029 2a47b1e5 2022-11-01 stsp * it as content to the diff engine.
5031 2a47b1e5 2022-11-01 stsp static const struct got_error *
5032 2a47b1e5 2022-11-01 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
5033 2a47b1e5 2022-11-01 stsp const char *abspath)
5035 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
5036 2a47b1e5 2022-11-01 stsp char target_path[PATH_MAX];
5037 2a47b1e5 2022-11-01 stsp ssize_t target_len, outlen;
5041 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
5042 2a47b1e5 2022-11-01 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
5043 2a47b1e5 2022-11-01 stsp if (target_len == -1)
5044 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlinkat", abspath);
5046 2a47b1e5 2022-11-01 stsp target_len = readlink(abspath, target_path, PATH_MAX);
5047 2a47b1e5 2022-11-01 stsp if (target_len == -1)
5048 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlink", abspath);
5051 2a47b1e5 2022-11-01 stsp *fd = got_opentempfd();
5052 2a47b1e5 2022-11-01 stsp if (*fd == -1)
5053 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentempfd");
5055 2a47b1e5 2022-11-01 stsp outlen = write(*fd, target_path, target_len);
5056 2a47b1e5 2022-11-01 stsp if (outlen == -1) {
5057 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5058 2a47b1e5 2022-11-01 stsp goto done;
5061 2a47b1e5 2022-11-01 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
5062 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("lseek", abspath);
5063 2a47b1e5 2022-11-01 stsp goto done;
5066 2a47b1e5 2022-11-01 stsp if (err) {
5067 2a47b1e5 2022-11-01 stsp close(*fd);
5070 2a47b1e5 2022-11-01 stsp return err;
5073 2a47b1e5 2022-11-01 stsp static const struct got_error *
5074 2a47b1e5 2022-11-01 stsp append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5075 2a47b1e5 2022-11-01 stsp FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5076 6d15dc69 2022-11-01 stsp int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5078 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
5079 2a47b1e5 2022-11-01 stsp struct got_blob_object *blob1 = NULL;
5080 2a47b1e5 2022-11-01 stsp int fd = -1, fd1 = -1, fd2 = -1;
5081 2a47b1e5 2022-11-01 stsp FILE *ondisk_file = NULL;
5082 2a47b1e5 2022-11-01 stsp char *label1 = NULL;
5083 2a47b1e5 2022-11-01 stsp struct stat sb;
5084 2a47b1e5 2022-11-01 stsp off_t size1 = 0;
5085 2a47b1e5 2022-11-01 stsp int f2_exists = 0;
5086 2a47b1e5 2022-11-01 stsp char *id_str = NULL;
5088 2a47b1e5 2022-11-01 stsp memset(&sb, 0, sizeof(sb));
5090 4ba5cca9 2022-11-01 stsp if (diff_staged) {
5091 4ba5cca9 2022-11-01 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5092 4ba5cca9 2022-11-01 stsp ct->staged_status != GOT_STATUS_ADD &&
5093 4ba5cca9 2022-11-01 stsp ct->staged_status != GOT_STATUS_DELETE)
5094 4ba5cca9 2022-11-01 stsp return NULL;
5096 4ba5cca9 2022-11-01 stsp if (ct->status != GOT_STATUS_MODIFY &&
5097 4ba5cca9 2022-11-01 stsp ct->status != GOT_STATUS_ADD &&
5098 12383673 2023-02-18 mark ct->status != GOT_STATUS_DELETE &&
5099 12383673 2023-02-18 mark ct->status != GOT_STATUS_CONFLICT)
5100 4ba5cca9 2022-11-01 stsp return NULL;
5103 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f1);
5105 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5106 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f2);
5108 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5110 2a47b1e5 2022-11-01 stsp if (!*diff_header_shown) {
5111 2a47b1e5 2022-11-01 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
5113 2a47b1e5 2022-11-01 stsp return err;
5114 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5115 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree));
5116 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "commit - %s\n", id_str);
5117 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "path + %s%s\n",
5118 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree),
5119 2a47b1e5 2022-11-01 stsp diff_staged ? " (staged changes)" : "");
5120 2a47b1e5 2022-11-01 stsp *diff_header_shown = 1;
5123 2a47b1e5 2022-11-01 stsp if (diff_staged) {
5124 2a47b1e5 2022-11-01 stsp const char *label1 = NULL, *label2 = NULL;
5125 2a47b1e5 2022-11-01 stsp switch (ct->staged_status) {
5126 2a47b1e5 2022-11-01 stsp case GOT_STATUS_MODIFY:
5127 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5128 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5130 2a47b1e5 2022-11-01 stsp case GOT_STATUS_ADD:
5131 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5133 2a47b1e5 2022-11-01 stsp case GOT_STATUS_DELETE:
5134 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5137 2a47b1e5 2022-11-01 stsp return got_error(GOT_ERR_FILE_STATUS);
5139 2a47b1e5 2022-11-01 stsp fd1 = got_opentempfd();
5140 2a47b1e5 2022-11-01 stsp if (fd1 == -1) {
5141 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5142 2a47b1e5 2022-11-01 stsp goto done;
5144 2a47b1e5 2022-11-01 stsp fd2 = got_opentempfd();
5145 2a47b1e5 2022-11-01 stsp if (fd2 == -1) {
5146 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5147 2a47b1e5 2022-11-01 stsp goto done;
5149 2a47b1e5 2022-11-01 stsp err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5150 2a47b1e5 2022-11-01 stsp fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5151 1f3405c9 2023-01-17 mark label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5152 a76e88e5 2023-01-10 mark NULL, repo, diff_outfile);
5153 2a47b1e5 2022-11-01 stsp goto done;
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;
5162 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_ADD) {
5163 2a47b1e5 2022-11-01 stsp err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5164 2a47b1e5 2022-11-01 stsp 8192, fd1);
5166 2a47b1e5 2022-11-01 stsp goto done;
5169 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_DELETE) {
5170 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
5171 2a47b1e5 2022-11-01 stsp fd = openat(dirfd, de_name,
5172 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5173 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5174 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5175 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("openat",
5176 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5177 2a47b1e5 2022-11-01 stsp goto done;
5179 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5180 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5182 2a47b1e5 2022-11-01 stsp goto done;
5185 2a47b1e5 2022-11-01 stsp fd = open(ct->ondisk_path,
5186 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5187 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5188 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5189 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("open",
5190 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5191 2a47b1e5 2022-11-01 stsp goto done;
5193 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5194 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5196 2a47b1e5 2022-11-01 stsp goto done;
5199 2a47b1e5 2022-11-01 stsp if (fstatat(fd, ct->ondisk_path, &sb,
5200 2a47b1e5 2022-11-01 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5201 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fstatat", ct->ondisk_path);
5202 2a47b1e5 2022-11-01 stsp goto done;
5204 2a47b1e5 2022-11-01 stsp ondisk_file = fdopen(fd, "r");
5205 2a47b1e5 2022-11-01 stsp if (ondisk_file == NULL) {
5206 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fdopen", ct->ondisk_path);
5207 2a47b1e5 2022-11-01 stsp goto done;
5210 2a47b1e5 2022-11-01 stsp f2_exists = 1;
5213 2a47b1e5 2022-11-01 stsp if (blob1) {
5214 2a47b1e5 2022-11-01 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5215 2a47b1e5 2022-11-01 stsp f1, blob1);
5217 2a47b1e5 2022-11-01 stsp goto done;
5220 2a47b1e5 2022-11-01 stsp err = got_diff_blob_file(blob1, f1, size1, label1,
5221 2a47b1e5 2022-11-01 stsp ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5222 1f3405c9 2023-01-17 mark GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5224 2a47b1e5 2022-11-01 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5225 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5226 2a47b1e5 2022-11-01 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5227 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5228 2a47b1e5 2022-11-01 stsp if (blob1)
5229 2a47b1e5 2022-11-01 stsp got_object_blob_close(blob1);
5230 2a47b1e5 2022-11-01 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5231 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5232 2a47b1e5 2022-11-01 stsp if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5233 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
5234 2a47b1e5 2022-11-01 stsp return err;
5237 c4296144 2019-05-09 stsp static const struct got_error *
5238 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
5239 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
5240 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5241 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
5243 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
5244 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
5245 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5246 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
5247 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
5248 768aea60 2019-05-09 stsp struct stat sb;
5250 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
5251 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
5252 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
5253 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5254 5f8a88c6 2019-08-03 stsp return NULL;
5256 12383673 2023-02-18 mark if (status == GOT_STATUS_CONFLICT && !a->commit_conflicts) {
5257 12383673 2023-02-18 mark printf("C %s\n", relpath);
5258 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
5261 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
5262 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
5263 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
5264 12383673 2023-02-18 mark status != GOT_STATUS_DELETE &&
5265 12383673 2023-02-18 mark status != GOT_STATUS_CONFLICT)
5266 5f8a88c6 2019-08-03 stsp return NULL;
5269 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
5270 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5271 036813ee 2019-05-09 stsp goto done;
5273 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
5274 036813ee 2019-05-09 stsp parent_path = strdup("");
5275 69960a46 2019-05-09 stsp if (parent_path == NULL)
5276 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
5278 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
5280 69960a46 2019-05-09 stsp return err;
5283 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
5284 cf066bf8 2019-05-09 stsp if (ct == NULL) {
5285 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
5286 c4296144 2019-05-09 stsp goto done;
5289 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5290 768aea60 2019-05-09 stsp relpath) == -1) {
5291 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5292 768aea60 2019-05-09 stsp goto done;
5295 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
5296 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
5297 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
5298 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5299 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
5300 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
5301 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
5302 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
5304 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
5305 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
5308 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5309 0aeb8099 2020-07-23 stsp goto done;
5311 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
5312 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
5313 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
5314 12463d8b 2019-12-13 stsp if (dirfd != -1) {
5315 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
5316 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5317 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
5318 12463d8b 2019-12-13 stsp ct->ondisk_path);
5319 12463d8b 2019-12-13 stsp goto done;
5321 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
5322 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
5323 768aea60 2019-05-09 stsp goto done;
5325 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5328 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5329 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5330 44d03001 2019-05-09 stsp relpath) == -1) {
5331 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5332 44d03001 2019-05-09 stsp goto done;
5335 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5336 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5337 35213c7c 2020-07-23 stsp int is_bad_symlink;
5338 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5339 35213c7c 2020-07-23 stsp ssize_t target_len;
5340 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5341 35213c7c 2020-07-23 stsp sizeof(target_path));
5342 35213c7c 2020-07-23 stsp if (target_len == -1) {
5343 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5344 35213c7c 2020-07-23 stsp ct->ondisk_path);
5345 35213c7c 2020-07-23 stsp goto done;
5347 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5348 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5350 35213c7c 2020-07-23 stsp goto done;
5351 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5352 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5353 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5354 35213c7c 2020-07-23 stsp goto done;
5359 cf066bf8 2019-05-09 stsp ct->status = status;
5360 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5361 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5362 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5363 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5364 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5365 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5366 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5367 b416585c 2019-05-13 stsp goto done;
5369 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5370 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5371 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5372 f0b75401 2019-08-03 stsp goto done;
5375 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5376 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5377 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5378 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5379 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5380 036813ee 2019-05-09 stsp goto done;
5383 24519714 2019-05-09 stsp ct->path = strdup(path);
5384 24519714 2019-05-09 stsp if (ct->path == NULL) {
5385 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5386 24519714 2019-05-09 stsp goto done;
5388 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5390 2a47b1e5 2022-11-01 stsp goto done;
5392 2a47b1e5 2022-11-01 stsp if (a->diff_outfile && ct && new != NULL) {
5393 2a47b1e5 2022-11-01 stsp err = append_ct_diff(ct, &a->diff_header_shown,
5394 2a47b1e5 2022-11-01 stsp a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5395 6d15dc69 2022-11-01 stsp a->have_staged_files, a->repo, a->worktree);
5397 2a47b1e5 2022-11-01 stsp goto done;
5400 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5401 ed175427 2019-05-09 stsp free_commitable(ct);
5402 24519714 2019-05-09 stsp free(parent_path);
5403 036813ee 2019-05-09 stsp free(path);
5404 a129376b 2019-03-28 stsp return err;
5407 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5408 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5409 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5410 036813ee 2019-05-09 stsp struct got_repository *);
5412 ed175427 2019-05-09 stsp static const struct got_error *
5413 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5414 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5415 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5416 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5417 afa376bf 2019-05-09 stsp struct got_repository *repo)
5419 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5420 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5421 036813ee 2019-05-09 stsp char *subpath;
5423 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5424 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5425 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5427 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5429 ed175427 2019-05-09 stsp return err;
5431 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5432 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5433 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5434 036813ee 2019-05-09 stsp free(subpath);
5435 036813ee 2019-05-09 stsp return err;
5438 036813ee 2019-05-09 stsp static const struct got_error *
5439 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5441 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5442 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5444 036813ee 2019-05-09 stsp *match = 0;
5446 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5447 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5448 0f63689d 2019-05-10 stsp return NULL;
5451 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5453 0f63689d 2019-05-10 stsp return err;
5454 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5455 036813ee 2019-05-09 stsp free(ct_parent_path);
5456 036813ee 2019-05-09 stsp return err;
5459 768aea60 2019-05-09 stsp static mode_t
5460 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5462 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5463 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5465 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5468 036813ee 2019-05-09 stsp static const struct got_error *
5469 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5470 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5472 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5474 036813ee 2019-05-09 stsp *new_te = NULL;
5476 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5478 036813ee 2019-05-09 stsp goto done;
5480 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5482 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5483 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5484 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5486 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5488 036813ee 2019-05-09 stsp if (err && *new_te) {
5489 56e0773d 2019-11-28 stsp free(*new_te);
5490 036813ee 2019-05-09 stsp *new_te = NULL;
5492 036813ee 2019-05-09 stsp return err;
5495 036813ee 2019-05-09 stsp static const struct got_error *
5496 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5497 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5499 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5500 102b254e 2020-10-19 stsp char *ct_name = NULL;
5502 036813ee 2019-05-09 stsp *new_te = NULL;
5504 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5505 036813ee 2019-05-09 stsp if (*new_te == NULL)
5506 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5508 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5510 036813ee 2019-05-09 stsp goto done;
5511 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5512 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5513 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5514 036813ee 2019-05-09 stsp goto done;
5517 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5519 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5520 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5521 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5523 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5525 102b254e 2020-10-19 stsp free(ct_name);
5526 036813ee 2019-05-09 stsp if (err && *new_te) {
5527 56e0773d 2019-11-28 stsp free(*new_te);
5528 036813ee 2019-05-09 stsp *new_te = NULL;
5530 036813ee 2019-05-09 stsp return err;
5533 036813ee 2019-05-09 stsp static const struct got_error *
5534 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5535 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5537 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5538 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5540 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5542 036813ee 2019-05-09 stsp return err;
5543 036813ee 2019-05-09 stsp if (new_pe == NULL)
5544 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5545 036813ee 2019-05-09 stsp return NULL;
5548 afa376bf 2019-05-09 stsp static const struct got_error *
5549 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5550 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5552 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5553 5f8a88c6 2019-08-03 stsp unsigned char status;
5555 0ff8d236 2021-09-28 stsp if (status_cb == NULL) /* no commit progress output desired */
5556 0ff8d236 2021-09-28 stsp return NULL;
5558 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5559 afa376bf 2019-05-09 stsp ct_path++;
5561 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5562 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5564 5f8a88c6 2019-08-03 stsp status = ct->status;
5566 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5567 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5570 036813ee 2019-05-09 stsp static const struct got_error *
5571 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5572 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5574 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5575 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5576 44d03001 2019-05-09 stsp char *te_path;
5578 44d03001 2019-05-09 stsp *modified = 0;
5580 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5581 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5582 44d03001 2019-05-09 stsp te->name) == -1)
5583 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5585 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5586 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5587 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5588 44d03001 2019-05-09 stsp strlen(te_path));
5589 62d463ca 2020-10-20 naddy if (*modified)
5593 44d03001 2019-05-09 stsp free(te_path);
5594 44d03001 2019-05-09 stsp return err;
5597 44d03001 2019-05-09 stsp static const struct got_error *
5598 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5599 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5600 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5602 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5603 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5605 036813ee 2019-05-09 stsp *ctp = NULL;
5607 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5608 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5609 036813ee 2019-05-09 stsp char *ct_name = NULL;
5610 036813ee 2019-05-09 stsp int path_matches;
5612 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5613 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5614 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5615 12383673 2023-02-18 mark ct->status != GOT_STATUS_DELETE &&
5616 12383673 2023-02-18 mark ct->status != GOT_STATUS_CONFLICT)
5619 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5620 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5624 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5627 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5629 036813ee 2019-05-09 stsp return err;
5630 036813ee 2019-05-09 stsp if (!path_matches)
5633 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5635 d34b633e 2020-10-19 stsp return err;
5637 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5638 d34b633e 2020-10-19 stsp free(ct_name);
5641 d34b633e 2020-10-19 stsp free(ct_name);
5643 036813ee 2019-05-09 stsp *ctp = ct;
5647 2b496619 2019-07-10 stsp return err;
5650 2b496619 2019-07-10 stsp static const struct got_error *
5651 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5652 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5653 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5654 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5655 2b496619 2019-07-10 stsp struct got_repository *repo)
5657 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5658 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5659 2b496619 2019-07-10 stsp char *subtree_path;
5660 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5661 ba580f68 2020-03-22 stsp int nentries;
5663 2b496619 2019-07-10 stsp *new_tep = NULL;
5665 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5666 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5667 2b496619 2019-07-10 stsp child_path) == -1)
5668 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5670 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5671 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5672 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5673 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5675 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5676 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5677 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5678 2b496619 2019-07-10 stsp goto done;
5680 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5681 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5682 2b496619 2019-07-10 stsp if (err) {
5683 56e0773d 2019-11-28 stsp free(new_te);
5684 2b496619 2019-07-10 stsp goto done;
5686 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5689 2b496619 2019-07-10 stsp free(subtree_path);
5690 2b496619 2019-07-10 stsp if (err == NULL)
5691 2b496619 2019-07-10 stsp *new_tep = new_te;
5692 036813ee 2019-05-09 stsp return err;
5695 036813ee 2019-05-09 stsp static const struct got_error *
5696 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5697 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5698 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5699 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5700 036813ee 2019-05-09 stsp struct got_repository *repo)
5702 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5703 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5704 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5705 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5707 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5708 ba580f68 2020-03-22 stsp *nentries = 0;
5710 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5711 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5712 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5713 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5715 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5716 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5717 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5720 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5721 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5724 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5725 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5727 036813ee 2019-05-09 stsp goto done;
5729 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5730 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5731 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5733 036813ee 2019-05-09 stsp goto done;
5734 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5736 afa376bf 2019-05-09 stsp goto done;
5737 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5738 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5740 2f51b5b3 2019-05-09 stsp goto done;
5741 ba580f68 2020-03-22 stsp (*nentries)++;
5743 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5744 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5745 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5746 2b496619 2019-07-10 stsp == NULL) {
5747 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5748 2b496619 2019-07-10 stsp child_path, path_base_tree,
5749 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5752 2b496619 2019-07-10 stsp goto done;
5753 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5755 2b496619 2019-07-10 stsp goto done;
5756 ba580f68 2020-03-22 stsp (*nentries)++;
5761 2f51b5b3 2019-05-09 stsp if (base_tree) {
5762 56e0773d 2019-11-28 stsp int i, nbase_entries;
5763 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5764 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5765 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5766 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5768 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5769 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5770 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5771 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5773 63c5ca5d 2019-08-24 stsp goto done;
5774 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5776 63c5ca5d 2019-08-24 stsp goto done;
5777 ba580f68 2020-03-22 stsp (*nentries)++;
5781 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5782 44d03001 2019-05-09 stsp int modified;
5783 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5785 036813ee 2019-05-09 stsp goto done;
5786 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5787 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5789 2f51b5b3 2019-05-09 stsp goto done;
5790 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5791 44d03001 2019-05-09 stsp if (modified) {
5792 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5793 ba580f68 2020-03-22 stsp int nsubentries;
5794 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5795 ba580f68 2020-03-22 stsp &nsubentries, te,
5796 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5797 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5799 44d03001 2019-05-09 stsp goto done;
5800 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5801 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5802 ba580f68 2020-03-22 stsp free(new_id);
5805 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5806 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5807 56e0773d 2019-11-28 stsp free(new_id);
5809 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5811 036813ee 2019-05-09 stsp goto done;
5812 ba580f68 2020-03-22 stsp (*nentries)++;
5816 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5817 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5819 f66c734c 2019-09-22 stsp goto done;
5821 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5822 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5823 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5824 12383673 2023-02-18 mark ct->status == GOT_STATUS_CONFLICT ||
5825 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5826 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5827 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5829 2f51b5b3 2019-05-09 stsp goto done;
5830 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5832 2f51b5b3 2019-05-09 stsp goto done;
5833 ba580f68 2020-03-22 stsp (*nentries)++;
5835 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5836 b416585c 2019-05-13 stsp status_arg);
5838 afa376bf 2019-05-09 stsp goto done;
5840 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5841 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5843 2f51b5b3 2019-05-09 stsp goto done;
5844 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5846 2f51b5b3 2019-05-09 stsp goto done;
5847 ba580f68 2020-03-22 stsp (*nentries)++;
5852 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5853 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5855 d8bacb93 2023-01-10 mark got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5856 2e1fa222 2020-07-23 stsp return err;
5859 2e1fa222 2020-07-23 stsp static const struct got_error *
5860 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5861 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5862 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5863 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5865 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5866 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5867 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5869 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5870 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5871 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5873 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5875 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5876 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5877 437adc9d 2020-12-10 yzhong if (err)
5878 437adc9d 2020-12-10 yzhong goto done;
5881 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5882 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5883 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5884 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5885 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5886 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5887 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5888 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5890 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5891 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5892 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5893 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5894 72fd46fa 2019-09-06 stsp !have_staged_files);
5896 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5897 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5898 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5899 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5900 72fd46fa 2019-09-06 stsp !have_staged_files);
5902 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5904 437adc9d 2020-12-10 yzhong goto done;
5905 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5906 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5907 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5908 3969253a 2020-03-07 stsp if (err) {
5909 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5910 437adc9d 2020-12-10 yzhong goto done;
5912 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5913 3969253a 2020-03-07 stsp if (err) {
5914 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5915 437adc9d 2020-12-10 yzhong goto done;
5918 437adc9d 2020-12-10 yzhong free(relpath);
5919 437adc9d 2020-12-10 yzhong relpath = NULL;
5922 437adc9d 2020-12-10 yzhong free(relpath);
5923 d56d26ce 2019-05-10 stsp return err;
5927 d56d26ce 2019-05-10 stsp static const struct got_error *
5928 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5929 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5930 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5931 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5932 735ef5ac 2019-08-03 stsp int ood_errcode)
5934 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5935 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
5936 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5938 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5939 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5940 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5941 1a36436d 2019-06-10 stsp return NULL;
5943 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5944 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5946 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5948 a44927cc 2022-04-07 stsp goto done;
5949 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5950 9bead371 2019-07-28 stsp if (err) {
5951 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5952 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5953 1a36436d 2019-06-10 stsp goto done;
5954 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5955 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5957 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5958 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5960 a44927cc 2022-04-07 stsp goto done;
5961 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5962 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5963 1a36436d 2019-06-10 stsp goto done;
5964 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5968 a44927cc 2022-04-07 stsp if (commit)
5969 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
5970 1a36436d 2019-06-10 stsp return err;
5973 336075a4 2022-06-25 op static const struct got_error *
5974 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5975 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5976 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5977 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5978 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5979 2a47b1e5 2022-11-01 stsp const char *author, const char *committer, char *diff_path,
5980 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5981 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5982 afa376bf 2019-05-09 stsp struct got_repository *repo)
5984 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5985 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5986 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5987 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5988 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5989 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5990 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5991 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5992 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5993 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5994 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5995 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5996 f8399b8f 2022-07-22 stsp time_t timestamp;
5998 c4296144 2019-05-09 stsp *new_commit_id = NULL;
6000 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
6002 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
6004 588edf97 2019-05-10 stsp goto done;
6006 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
6008 588edf97 2019-05-10 stsp goto done;
6010 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
6011 2a47b1e5 2022-11-01 stsp err = commit_msg_cb(commitable_paths, diff_path,
6012 2a47b1e5 2022-11-01 stsp &logmsg, commit_arg);
6017 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
6018 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6022 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
6023 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
6024 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
6025 cf066bf8 2019-05-09 stsp char *ondisk_path;
6027 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
6028 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
6029 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
6032 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
6033 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
6034 12383673 2023-02-18 mark ct->status != GOT_STATUS_MODE_CHANGE &&
6035 12383673 2023-02-18 mark ct->status != GOT_STATUS_CONFLICT)
6038 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
6039 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
6040 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
6041 cf066bf8 2019-05-09 stsp goto done;
6043 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
6044 2e1fa222 2020-07-23 stsp free(ondisk_path);
6046 cf066bf8 2019-05-09 stsp goto done;
6049 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
6050 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
6051 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
6053 036813ee 2019-05-09 stsp goto done;
6055 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
6057 de18fc63 2019-05-09 stsp goto done;
6058 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6059 f259c4c1 2021-09-24 stsp nparents++;
6060 f259c4c1 2021-09-24 stsp if (parent_id2) {
6061 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
6063 f259c4c1 2021-09-24 stsp goto done;
6064 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6065 f259c4c1 2021-09-24 stsp nparents++;
6067 f8399b8f 2022-07-22 stsp timestamp = time(NULL);
6068 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
6069 f8399b8f 2022-07-22 stsp nparents, author, timestamp, committer, timestamp, logmsg, repo);
6070 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
6071 33ad4cbe 2019-05-12 jcs free(logmsg);
6073 9d40349a 2019-05-09 stsp goto done;
6075 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
6076 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
6077 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
6078 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
6079 09f5bd90 2019-05-09 stsp goto done;
6081 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
6082 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6084 09f5bd90 2019-05-09 stsp goto done;
6085 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6087 ebf99748 2019-05-09 stsp goto done;
6088 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6089 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6090 09f5bd90 2019-05-09 stsp goto done;
6092 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
6093 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
6095 f2c16586 2019-05-09 stsp goto done;
6096 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
6098 f2c16586 2019-05-09 stsp goto done;
6100 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6102 09f5bd90 2019-05-09 stsp goto done;
6104 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
6106 ebf99748 2019-05-09 stsp goto done;
6108 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
6109 588edf97 2019-05-10 stsp if (head_tree)
6110 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
6111 588edf97 2019-05-10 stsp if (head_commit)
6112 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
6113 09f5bd90 2019-05-09 stsp free(head_commit_id2);
6114 2f17228e 2019-05-12 stsp if (head_ref2) {
6115 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
6116 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
6117 2f17228e 2019-05-12 stsp err = unlockerr;
6118 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
6120 39cd0ff6 2019-07-12 stsp return err;
6123 5c1e53bc 2019-07-28 stsp static const struct got_error *
6124 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
6125 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
6127 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
6128 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
6130 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
6131 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
6132 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
6134 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
6135 5c1e53bc 2019-07-28 stsp ct_path++;
6137 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
6138 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
6142 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
6143 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
6145 5c1e53bc 2019-07-28 stsp return NULL;
6148 f0b75401 2019-08-03 stsp static const struct got_error *
6149 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
6151 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
6153 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6154 f0b75401 2019-08-03 stsp *have_staged_files = 1;
6155 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
6158 f0b75401 2019-08-03 stsp return NULL;
6161 5f8a88c6 2019-08-03 stsp static const struct got_error *
6162 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
6163 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
6165 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
6166 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
6168 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6169 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
6171 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6172 5f8a88c6 2019-08-03 stsp if (ie == NULL)
6173 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6174 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6175 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
6176 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
6179 5f8a88c6 2019-08-03 stsp return NULL;
6182 39cd0ff6 2019-07-12 stsp const struct got_error *
6183 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
6184 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
6185 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
6186 12383673 2023-02-18 mark int show_diff, int commit_conflicts,
6187 12383673 2023-02-18 mark got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6188 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
6189 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
6191 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6192 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
6193 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
6194 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6195 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6196 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
6197 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
6198 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6199 2a47b1e5 2022-11-01 stsp char *diff_path = NULL;
6200 f0b75401 2019-08-03 stsp int have_staged_files = 0;
6202 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
6204 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6205 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6207 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
6209 39cd0ff6 2019-07-12 stsp goto done;
6211 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6213 39cd0ff6 2019-07-12 stsp goto done;
6215 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6217 39cd0ff6 2019-07-12 stsp goto done;
6219 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6221 39cd0ff6 2019-07-12 stsp goto done;
6223 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6224 5f8a88c6 2019-08-03 stsp &have_staged_files);
6225 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
6226 5f8a88c6 2019-08-03 stsp goto done;
6227 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
6228 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
6230 5f8a88c6 2019-08-03 stsp goto done;
6233 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6234 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
6235 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
6236 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
6237 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
6238 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6239 2a47b1e5 2022-11-01 stsp cc_arg.diff_header_shown = 0;
6240 12383673 2023-02-18 mark cc_arg.commit_conflicts = commit_conflicts;
6241 2a47b1e5 2022-11-01 stsp if (show_diff) {
6242 2a47b1e5 2022-11-01 stsp err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6243 b90054ed 2022-11-01 stsp GOT_TMPDIR_STR "/got", ".diff");
6245 2a47b1e5 2022-11-01 stsp goto done;
6246 2a47b1e5 2022-11-01 stsp cc_arg.f1 = got_opentemp();
6247 2a47b1e5 2022-11-01 stsp if (cc_arg.f1 == NULL) {
6248 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6249 2a47b1e5 2022-11-01 stsp goto done;
6251 2a47b1e5 2022-11-01 stsp cc_arg.f2 = got_opentemp();
6252 2a47b1e5 2022-11-01 stsp if (cc_arg.f2 == NULL) {
6253 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6254 2a47b1e5 2022-11-01 stsp goto done;
6258 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6259 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6260 4ba2e955 2022-09-02 sh+got collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6262 5c1e53bc 2019-07-28 stsp goto done;
6265 2a47b1e5 2022-11-01 stsp if (show_diff) {
6266 2a47b1e5 2022-11-01 stsp if (fflush(cc_arg.diff_outfile) == EOF) {
6267 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fflush");
6268 2a47b1e5 2022-11-01 stsp goto done;
6272 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6273 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6274 39cd0ff6 2019-07-12 stsp goto done;
6277 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6278 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
6280 5c1e53bc 2019-07-28 stsp goto done;
6283 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6284 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
6285 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
6287 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
6288 f0b75401 2019-08-03 stsp ct_path++;
6289 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
6290 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6291 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6293 b50cabdf 2019-07-12 stsp goto done;
6297 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
6298 210c2321 2022-11-01 stsp head_commit_id, NULL, worktree, author, committer,
6299 210c2321 2022-11-01 stsp (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6300 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6302 39cd0ff6 2019-07-12 stsp goto done;
6304 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6305 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
6306 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6307 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
6308 39cd0ff6 2019-07-12 stsp err = sync_err;
6310 39cd0ff6 2019-07-12 stsp if (fileindex)
6311 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
6312 39cd0ff6 2019-07-12 stsp free(fileindex_path);
6313 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6314 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
6315 39cd0ff6 2019-07-12 stsp err = unlockerr;
6316 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6317 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
6319 39cd0ff6 2019-07-12 stsp free_commitable(ct);
6321 d8bacb93 2023-01-10 mark got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6322 2a47b1e5 2022-11-01 stsp if (diff_path && unlink(diff_path) == -1 && err == NULL)
6323 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("unlink", diff_path);
6324 2a47b1e5 2022-11-01 stsp free(diff_path);
6325 2a47b1e5 2022-11-01 stsp if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6326 2a47b1e5 2022-11-01 stsp err == NULL)
6327 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
6328 c4296144 2019-05-09 stsp return err;
6331 8656d6c4 2019-05-20 stsp const char *
6332 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
6334 8656d6c4 2019-05-20 stsp return ct->path;
6337 8656d6c4 2019-05-20 stsp unsigned int
6338 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
6340 8656d6c4 2019-05-20 stsp return ct->status;
6343 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
6344 818c7501 2019-07-11 stsp struct got_worktree *worktree;
6345 818c7501 2019-07-11 stsp struct got_repository *repo;
6348 818c7501 2019-07-11 stsp static const struct got_error *
6349 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6351 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6352 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
6353 818c7501 2019-07-11 stsp unsigned char status;
6354 818c7501 2019-07-11 stsp struct stat sb;
6355 818c7501 2019-07-11 stsp char *ondisk_path;
6357 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
6358 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6359 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
6360 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
6362 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6364 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
6366 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
6367 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6368 818c7501 2019-07-11 stsp free(ondisk_path);
6370 818c7501 2019-07-11 stsp return err;
6372 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
6373 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
6374 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6375 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6377 818c7501 2019-07-11 stsp return NULL;
6380 818c7501 2019-07-11 stsp const struct got_error *
6381 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6382 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6383 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
6384 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6386 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6387 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6388 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6389 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6390 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6391 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6392 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6394 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6395 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6396 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6398 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6400 818c7501 2019-07-11 stsp return err;
6402 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6404 818c7501 2019-07-11 stsp goto done;
6406 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6407 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6408 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6411 818c7501 2019-07-11 stsp goto done;
6413 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6415 818c7501 2019-07-11 stsp goto done;
6417 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6419 818c7501 2019-07-11 stsp goto done;
6421 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6423 818c7501 2019-07-11 stsp goto done;
6425 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6428 e51d7b55 2020-01-04 stsp goto done;
6430 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6432 818c7501 2019-07-11 stsp goto done;
6433 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6434 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6435 e51d7b55 2020-01-04 stsp goto done;
6438 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6439 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6441 818c7501 2019-07-11 stsp goto done;
6442 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6444 818c7501 2019-07-11 stsp goto done;
6446 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6448 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6450 818c7501 2019-07-11 stsp goto done;
6452 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6454 818c7501 2019-07-11 stsp goto done;
6456 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6457 818c7501 2019-07-11 stsp worktree->base_commit_id);
6459 818c7501 2019-07-11 stsp goto done;
6460 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6462 818c7501 2019-07-11 stsp goto done;
6464 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6466 818c7501 2019-07-11 stsp goto done;
6468 818c7501 2019-07-11 stsp free(fileindex_path);
6469 818c7501 2019-07-11 stsp free(tmp_branch_name);
6470 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6471 818c7501 2019-07-11 stsp free(branch_ref_name);
6472 818c7501 2019-07-11 stsp if (branch_ref)
6473 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6474 818c7501 2019-07-11 stsp if (wt_branch)
6475 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6476 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6477 818c7501 2019-07-11 stsp if (err) {
6478 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6479 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6480 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6482 818c7501 2019-07-11 stsp if (*tmp_branch) {
6483 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6484 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6486 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6487 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6488 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6490 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6492 818c7501 2019-07-11 stsp return err;
6495 818c7501 2019-07-11 stsp const struct got_error *
6496 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6497 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6498 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6499 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6501 818c7501 2019-07-11 stsp const struct got_error *err;
6502 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6503 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6504 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6505 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6506 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6508 818c7501 2019-07-11 stsp *commit_id = NULL;
6509 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6510 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6511 3e3a69f1 2019-07-25 stsp *branch = NULL;
6512 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6514 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6516 3e3a69f1 2019-07-25 stsp return err;
6518 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6520 f032f1f7 2019-08-04 stsp goto done;
6522 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6523 f032f1f7 2019-08-04 stsp &have_staged_files);
6524 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6525 f032f1f7 2019-08-04 stsp goto done;
6526 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6527 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6528 3e3a69f1 2019-07-25 stsp goto done;
6531 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6533 f032f1f7 2019-08-04 stsp goto done;
6535 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6537 818c7501 2019-07-11 stsp goto done;
6539 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6541 818c7501 2019-07-11 stsp goto done;
6543 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6545 818c7501 2019-07-11 stsp goto done;
6547 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6549 818c7501 2019-07-11 stsp goto done;
6551 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6552 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6554 818c7501 2019-07-11 stsp goto done;
6556 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6558 818c7501 2019-07-11 stsp goto done;
6560 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6562 818c7501 2019-07-11 stsp goto done;
6564 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6565 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6567 818c7501 2019-07-11 stsp goto done;
6569 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6571 818c7501 2019-07-11 stsp goto done;
6573 818c7501 2019-07-11 stsp free(commit_ref_name);
6574 818c7501 2019-07-11 stsp free(branch_ref_name);
6575 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6576 818c7501 2019-07-11 stsp if (commit_ref)
6577 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6578 818c7501 2019-07-11 stsp if (branch_ref)
6579 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6580 818c7501 2019-07-11 stsp if (err) {
6581 818c7501 2019-07-11 stsp free(*commit_id);
6582 818c7501 2019-07-11 stsp *commit_id = NULL;
6583 818c7501 2019-07-11 stsp if (*tmp_branch) {
6584 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6585 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6587 818c7501 2019-07-11 stsp if (*new_base_branch) {
6588 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6589 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6591 818c7501 2019-07-11 stsp if (*branch) {
6592 818c7501 2019-07-11 stsp got_ref_close(*branch);
6593 818c7501 2019-07-11 stsp *branch = NULL;
6595 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6596 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6597 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6599 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6601 818c7501 2019-07-11 stsp return err;
6604 818c7501 2019-07-11 stsp const struct got_error *
6605 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6607 818c7501 2019-07-11 stsp const struct got_error *err;
6608 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6610 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6612 818c7501 2019-07-11 stsp return err;
6614 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6615 818c7501 2019-07-11 stsp free(tmp_branch_name);
6616 818c7501 2019-07-11 stsp return NULL;
6619 818c7501 2019-07-11 stsp static const struct got_error *
6620 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6621 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
6623 0ebf8283 2019-07-24 stsp *logmsg = arg;
6624 818c7501 2019-07-11 stsp return NULL;
6627 818c7501 2019-07-11 stsp static const struct got_error *
6628 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6629 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6630 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6631 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6633 818c7501 2019-07-11 stsp return NULL;
6636 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6637 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6638 01757395 2019-07-12 stsp void *progress_arg;
6639 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6642 01757395 2019-07-12 stsp static const struct got_error *
6643 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6645 01757395 2019-07-12 stsp const struct got_error *err;
6646 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6648 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6650 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6652 01757395 2019-07-12 stsp return err;
6654 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6655 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6656 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6657 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6658 01757395 2019-07-12 stsp return NULL;
6660 01757395 2019-07-12 stsp p = strdup(path);
6661 01757395 2019-07-12 stsp if (p == NULL)
6662 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6664 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6665 01757395 2019-07-12 stsp if (err || new == NULL)
6667 01757395 2019-07-12 stsp return err;
6670 0ebf8283 2019-07-24 stsp static const struct got_error *
6671 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6672 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6674 818c7501 2019-07-11 stsp const struct got_error *err;
6675 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6677 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6678 818c7501 2019-07-11 stsp if (err) {
6679 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6680 818c7501 2019-07-11 stsp goto done;
6681 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6683 818c7501 2019-07-11 stsp goto done;
6684 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6686 818c7501 2019-07-11 stsp goto done;
6687 de05890f 2020-03-05 stsp } else if (is_rebase) {
6688 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6691 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6693 818c7501 2019-07-11 stsp goto done;
6694 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6695 818c7501 2019-07-11 stsp free(stored_id);
6696 818c7501 2019-07-11 stsp if (cmp != 0) {
6697 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6698 818c7501 2019-07-11 stsp goto done;
6702 0ebf8283 2019-07-24 stsp if (commit_ref)
6703 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6704 0ebf8283 2019-07-24 stsp return err;
6707 0ebf8283 2019-07-24 stsp static const struct got_error *
6708 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6709 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6710 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6711 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6712 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6713 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6715 0ebf8283 2019-07-24 stsp const struct got_error *err;
6716 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6717 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6718 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6720 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6722 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6724 0ebf8283 2019-07-24 stsp return err;
6726 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6727 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6728 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6729 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6730 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6731 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6732 818c7501 2019-07-11 stsp if (commit_ref)
6733 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6734 818c7501 2019-07-11 stsp return err;
6737 818c7501 2019-07-11 stsp const struct got_error *
6738 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6739 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6740 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6741 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6742 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6743 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6745 0ebf8283 2019-07-24 stsp const struct got_error *err;
6746 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6748 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6750 0ebf8283 2019-07-24 stsp return err;
6752 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6754 0ebf8283 2019-07-24 stsp goto done;
6756 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6757 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6758 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6760 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6761 0ebf8283 2019-07-24 stsp return err;
6764 0ebf8283 2019-07-24 stsp const struct got_error *
6765 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6766 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6767 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6768 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6769 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6770 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6772 0ebf8283 2019-07-24 stsp const struct got_error *err;
6773 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6775 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6777 0ebf8283 2019-07-24 stsp return err;
6779 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6781 0ebf8283 2019-07-24 stsp goto done;
6783 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6784 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6785 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6787 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6788 0ebf8283 2019-07-24 stsp return err;
6791 0ebf8283 2019-07-24 stsp static const struct got_error *
6792 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6793 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6794 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6795 598eac43 2022-07-22 stsp struct got_reference *tmp_branch, const char *committer,
6796 598eac43 2022-07-22 stsp struct got_commit_object *orig_commit, const char *new_logmsg,
6797 12383673 2023-02-18 mark int allow_conflict, struct got_repository *repo)
6799 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6800 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6801 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6802 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6803 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6804 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6805 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6807 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6808 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6809 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6811 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6813 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6815 3e3a69f1 2019-07-25 stsp return err;
6817 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6818 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6819 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6820 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6821 12383673 2023-02-18 mark cc_arg.commit_conflicts = allow_conflict;
6823 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6824 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6826 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6827 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6828 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6829 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6830 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6831 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6833 01757395 2019-07-12 stsp if (merged_paths) {
6834 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6835 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6836 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6837 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6840 01757395 2019-07-12 stsp goto done;
6843 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6844 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6846 01757395 2019-07-12 stsp goto done;
6849 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6850 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6851 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6853 a0e95631 2019-07-12 stsp goto done;
6854 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6855 a0e95631 2019-07-12 stsp goto done;
6858 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6860 edd02c5e 2019-07-11 stsp goto done;
6862 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6864 818c7501 2019-07-11 stsp goto done;
6866 5943eee2 2019-08-13 stsp if (new_logmsg) {
6867 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6868 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6869 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6870 5943eee2 2019-08-13 stsp goto done;
6873 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6875 5943eee2 2019-08-13 stsp goto done;
6878 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6879 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6880 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6881 50e7a649 2022-07-22 stsp committer ? committer :
6882 2a47b1e5 2022-11-01 stsp got_object_commit_get_committer(orig_commit), NULL,
6883 50e7a649 2022-07-22 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6885 a0e95631 2019-07-12 stsp goto done;
6887 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6889 a0e95631 2019-07-12 stsp goto done;
6891 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6893 a0e95631 2019-07-12 stsp goto done;
6895 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6896 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6897 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6898 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6899 a0e95631 2019-07-12 stsp err = sync_err;
6901 a0e95631 2019-07-12 stsp free(fileindex_path);
6902 a0e95631 2019-07-12 stsp free(head_commit_id);
6903 a0e95631 2019-07-12 stsp if (head_ref)
6904 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6905 818c7501 2019-07-11 stsp if (err) {
6906 818c7501 2019-07-11 stsp free(*new_commit_id);
6907 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6909 818c7501 2019-07-11 stsp return err;
6912 818c7501 2019-07-11 stsp const struct got_error *
6913 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6914 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6915 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6916 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6917 12383673 2023-02-18 mark struct got_object_id *orig_commit_id, int allow_conflict,
6918 12383673 2023-02-18 mark struct got_repository *repo)
6920 0ebf8283 2019-07-24 stsp const struct got_error *err;
6921 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6922 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6923 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6925 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6927 0ebf8283 2019-07-24 stsp return err;
6929 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6931 0ebf8283 2019-07-24 stsp goto done;
6932 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6934 0ebf8283 2019-07-24 stsp goto done;
6935 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6936 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6937 0ebf8283 2019-07-24 stsp goto done;
6940 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6941 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6942 12383673 2023-02-18 mark NULL, allow_conflict, repo);
6944 0ebf8283 2019-07-24 stsp if (commit_ref)
6945 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6946 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6947 0ebf8283 2019-07-24 stsp free(commit_id);
6948 0ebf8283 2019-07-24 stsp return err;
6951 0ebf8283 2019-07-24 stsp const struct got_error *
6952 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6953 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6954 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6955 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6956 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6957 12383673 2023-02-18 mark int allow_conflict, struct got_repository *repo)
6959 0ebf8283 2019-07-24 stsp const struct got_error *err;
6960 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6961 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6963 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6965 0ebf8283 2019-07-24 stsp return err;
6967 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6969 0ebf8283 2019-07-24 stsp goto done;
6971 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6972 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6973 12383673 2023-02-18 mark new_logmsg, allow_conflict, repo);
6975 0ebf8283 2019-07-24 stsp if (commit_ref)
6976 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6977 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6978 0ebf8283 2019-07-24 stsp return err;
6981 0ebf8283 2019-07-24 stsp const struct got_error *
6982 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6983 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6985 3e3a69f1 2019-07-25 stsp if (fileindex)
6986 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6987 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6990 69844fba 2019-07-11 stsp static const struct got_error *
6991 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6993 69844fba 2019-07-11 stsp const struct got_error *err;
6994 69844fba 2019-07-11 stsp struct got_reference *ref;
6996 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6997 69844fba 2019-07-11 stsp if (err) {
6998 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6999 69844fba 2019-07-11 stsp return NULL;
7000 69844fba 2019-07-11 stsp return err;
7003 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
7004 69844fba 2019-07-11 stsp got_ref_close(ref);
7005 69844fba 2019-07-11 stsp return err;
7008 69844fba 2019-07-11 stsp static const struct got_error *
7009 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
7011 69844fba 2019-07-11 stsp const struct got_error *err;
7012 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
7013 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7015 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
7017 69844fba 2019-07-11 stsp goto done;
7018 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
7020 69844fba 2019-07-11 stsp goto done;
7022 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
7024 69844fba 2019-07-11 stsp goto done;
7025 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
7027 69844fba 2019-07-11 stsp goto done;
7029 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
7031 69844fba 2019-07-11 stsp goto done;
7032 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
7034 69844fba 2019-07-11 stsp goto done;
7036 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7038 69844fba 2019-07-11 stsp goto done;
7039 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
7041 69844fba 2019-07-11 stsp goto done;
7044 69844fba 2019-07-11 stsp free(tmp_branch_name);
7045 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
7046 69844fba 2019-07-11 stsp free(branch_ref_name);
7047 69844fba 2019-07-11 stsp free(commit_ref_name);
7048 e600f124 2021-03-21 stsp return err;
7051 336075a4 2022-06-25 op static const struct got_error *
7052 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
7053 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
7055 e600f124 2021-03-21 stsp const struct got_error *err;
7056 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
7057 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
7058 e600f124 2021-03-21 stsp const char *branch_name = NULL;
7059 e600f124 2021-03-21 stsp char *new_id_str = NULL;
7060 e600f124 2021-03-21 stsp char *refname = NULL;
7062 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
7063 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
7064 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
7065 e600f124 2021-03-21 stsp branch_name += 11;
7067 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
7069 e600f124 2021-03-21 stsp return err;
7071 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
7072 e600f124 2021-03-21 stsp new_id_str) == -1) {
7073 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
7074 e600f124 2021-03-21 stsp goto done;
7077 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
7079 e600f124 2021-03-21 stsp goto done;
7081 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
7083 e600f124 2021-03-21 stsp goto done;
7085 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
7087 e600f124 2021-03-21 stsp free(new_id_str);
7088 e600f124 2021-03-21 stsp free(refname);
7089 e600f124 2021-03-21 stsp free(old_commit_id);
7091 e600f124 2021-03-21 stsp got_ref_close(ref);
7092 69844fba 2019-07-11 stsp return err;
7095 818c7501 2019-07-11 stsp const struct got_error *
7096 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
7097 ef85a376 2023-02-01 mark struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7098 ef85a376 2023-02-01 mark struct got_reference *rebased_branch, struct got_repository *repo,
7099 ef85a376 2023-02-01 mark int create_backup)
7101 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7102 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
7103 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7105 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7107 818c7501 2019-07-11 stsp return err;
7109 e600f124 2021-03-21 stsp if (create_backup) {
7110 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7111 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
7113 e600f124 2021-03-21 stsp goto done;
7116 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7118 818c7501 2019-07-11 stsp goto done;
7120 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
7122 818c7501 2019-07-11 stsp goto done;
7124 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
7126 818c7501 2019-07-11 stsp goto done;
7128 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
7130 a615e0e7 2020-12-16 stsp goto done;
7132 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7134 a615e0e7 2020-12-16 stsp goto done;
7135 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7136 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7137 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7138 a615e0e7 2020-12-16 stsp err = sync_err;
7140 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7141 a615e0e7 2020-12-16 stsp free(fileindex_path);
7142 818c7501 2019-07-11 stsp free(new_head_commit_id);
7143 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7144 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7145 818c7501 2019-07-11 stsp err = unlockerr;
7146 818c7501 2019-07-11 stsp return err;
7149 818c7501 2019-07-11 stsp const struct got_error *
7150 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
7151 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7152 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
7153 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
7155 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
7156 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
7157 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
7158 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7159 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
7160 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7161 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
7163 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
7165 818c7501 2019-07-11 stsp return err;
7167 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7168 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7170 a44927cc 2022-04-07 stsp goto done;
7172 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
7173 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
7175 818c7501 2019-07-11 stsp goto done;
7177 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
7179 818c7501 2019-07-11 stsp goto done;
7182 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
7183 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
7184 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
7186 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
7188 818c7501 2019-07-11 stsp goto done;
7190 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7192 818c7501 2019-07-11 stsp goto done;
7194 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7195 a44927cc 2022-04-07 stsp worktree->path_prefix);
7197 ca355955 2019-07-12 stsp goto done;
7199 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
7201 ca355955 2019-07-12 stsp goto done;
7203 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7205 818c7501 2019-07-11 stsp goto done;
7207 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7208 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7209 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7210 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7211 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7212 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7213 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7214 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7215 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
7216 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7218 1f1abb7e 2019-08-08 stsp goto sync;
7220 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7221 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
7223 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7224 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
7225 ca355955 2019-07-12 stsp err = sync_err;
7227 818c7501 2019-07-11 stsp got_ref_close(resolved);
7228 a3a2faf2 2019-07-12 stsp free(tree_id);
7229 818c7501 2019-07-11 stsp free(commit_id);
7230 a44927cc 2022-04-07 stsp if (commit)
7231 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7232 0ebf8283 2019-07-24 stsp if (fileindex)
7233 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
7234 0ebf8283 2019-07-24 stsp free(fileindex_path);
7236 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7237 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7238 0ebf8283 2019-07-24 stsp err = unlockerr;
7239 0ebf8283 2019-07-24 stsp return err;
7242 0ebf8283 2019-07-24 stsp const struct got_error *
7243 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7244 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7245 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7246 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7248 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7249 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7250 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
7251 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
7252 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7253 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
7254 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
7255 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7257 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7258 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7259 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7260 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7262 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7264 0ebf8283 2019-07-24 stsp return err;
7266 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7268 0ebf8283 2019-07-24 stsp goto done;
7270 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
7271 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
7272 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7275 0ebf8283 2019-07-24 stsp goto done;
7277 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7279 0ebf8283 2019-07-24 stsp goto done;
7281 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7283 0ebf8283 2019-07-24 stsp goto done;
7285 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7286 0ebf8283 2019-07-24 stsp worktree);
7288 0ebf8283 2019-07-24 stsp goto done;
7290 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7293 0ebf8283 2019-07-24 stsp goto done;
7295 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7297 0ebf8283 2019-07-24 stsp goto done;
7299 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
7301 0ebf8283 2019-07-24 stsp goto done;
7303 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7304 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7306 0ebf8283 2019-07-24 stsp goto done;
7307 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
7309 0ebf8283 2019-07-24 stsp goto done;
7310 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7311 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
7312 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
7313 0ebf8283 2019-07-24 stsp goto done;
7316 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
7317 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7319 0ebf8283 2019-07-24 stsp goto done;
7320 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
7322 0ebf8283 2019-07-24 stsp goto done;
7324 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
7326 0ebf8283 2019-07-24 stsp goto done;
7328 0ebf8283 2019-07-24 stsp free(fileindex_path);
7329 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7330 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7331 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7332 0ebf8283 2019-07-24 stsp if (wt_branch)
7333 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
7334 0ebf8283 2019-07-24 stsp if (err) {
7335 0ebf8283 2019-07-24 stsp if (*branch_ref) {
7336 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
7337 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7339 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7340 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7341 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7343 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7344 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7345 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7346 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7348 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
7350 0ebf8283 2019-07-24 stsp return err;
7353 0ebf8283 2019-07-24 stsp const struct got_error *
7354 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
7355 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
7357 3e3a69f1 2019-07-25 stsp if (fileindex)
7358 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
7359 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
7362 0ebf8283 2019-07-24 stsp const struct got_error *
7363 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
7364 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
7366 0ebf8283 2019-07-24 stsp const struct got_error *err;
7367 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7369 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7371 0ebf8283 2019-07-24 stsp return err;
7373 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7374 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7375 0ebf8283 2019-07-24 stsp return NULL;
7378 0ebf8283 2019-07-24 stsp const struct got_error *
7379 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
7380 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
7381 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7382 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7384 0ebf8283 2019-07-24 stsp const struct got_error *err;
7385 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7386 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7387 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
7388 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7389 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
7390 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
7392 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7393 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7394 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7395 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7397 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7399 3e3a69f1 2019-07-25 stsp return err;
7401 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7403 f032f1f7 2019-08-04 stsp goto done;
7405 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7406 f032f1f7 2019-08-04 stsp &have_staged_files);
7407 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7408 f032f1f7 2019-08-04 stsp goto done;
7409 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7410 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7411 3e3a69f1 2019-07-25 stsp goto done;
7414 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7416 f032f1f7 2019-08-04 stsp goto done;
7418 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7420 0ebf8283 2019-07-24 stsp goto done;
7422 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7424 0ebf8283 2019-07-24 stsp goto done;
7426 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7427 0ebf8283 2019-07-24 stsp worktree);
7429 0ebf8283 2019-07-24 stsp goto done;
7431 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7433 0ebf8283 2019-07-24 stsp goto done;
7435 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7437 0ebf8283 2019-07-24 stsp goto done;
7438 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7440 0ebf8283 2019-07-24 stsp goto done;
7442 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7444 0ebf8283 2019-07-24 stsp goto done;
7445 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7447 0ebf8283 2019-07-24 stsp goto done;
7449 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7451 0ebf8283 2019-07-24 stsp goto done;
7453 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7454 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7455 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7456 0ebf8283 2019-07-24 stsp if (commit_ref)
7457 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7458 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7459 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7460 0ebf8283 2019-07-24 stsp if (err) {
7461 0ebf8283 2019-07-24 stsp free(*commit_id);
7462 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7463 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7464 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7465 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7466 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7467 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7469 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7470 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7471 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7473 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7475 0ebf8283 2019-07-24 stsp return err;
7478 0ebf8283 2019-07-24 stsp static const struct got_error *
7479 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7481 0ebf8283 2019-07-24 stsp const struct got_error *err;
7482 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7483 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7485 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7487 0ebf8283 2019-07-24 stsp goto done;
7488 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7490 0ebf8283 2019-07-24 stsp goto done;
7492 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7493 0ebf8283 2019-07-24 stsp worktree);
7495 0ebf8283 2019-07-24 stsp goto done;
7496 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7498 0ebf8283 2019-07-24 stsp goto done;
7500 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7502 0ebf8283 2019-07-24 stsp goto done;
7503 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7505 0ebf8283 2019-07-24 stsp goto done;
7507 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7509 0ebf8283 2019-07-24 stsp goto done;
7510 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7512 0ebf8283 2019-07-24 stsp goto done;
7514 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7515 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7516 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7517 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7518 0ebf8283 2019-07-24 stsp return err;
7521 0ebf8283 2019-07-24 stsp const struct got_error *
7522 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7523 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7524 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7525 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7527 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7528 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7529 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7530 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7531 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7532 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7534 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7536 0ebf8283 2019-07-24 stsp return err;
7538 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7539 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7541 a44927cc 2022-04-07 stsp goto done;
7543 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7544 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7546 0ebf8283 2019-07-24 stsp goto done;
7548 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7550 0ebf8283 2019-07-24 stsp goto done;
7552 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7554 0ebf8283 2019-07-24 stsp goto done;
7556 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7557 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7559 0ebf8283 2019-07-24 stsp goto done;
7561 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7563 0ebf8283 2019-07-24 stsp goto done;
7565 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7567 0ebf8283 2019-07-24 stsp goto done;
7569 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7570 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7571 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7572 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7573 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7574 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7575 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7576 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7577 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7578 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7580 1f1abb7e 2019-08-08 stsp goto sync;
7582 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7583 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7585 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7586 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7587 0ebf8283 2019-07-24 stsp err = sync_err;
7589 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7590 0ebf8283 2019-07-24 stsp free(tree_id);
7591 818c7501 2019-07-11 stsp free(fileindex_path);
7593 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7594 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7595 818c7501 2019-07-11 stsp err = unlockerr;
7596 818c7501 2019-07-11 stsp return err;
7599 0ebf8283 2019-07-24 stsp const struct got_error *
7600 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7601 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7602 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7604 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7605 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7606 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7607 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7609 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7611 0ebf8283 2019-07-24 stsp return err;
7613 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7614 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7616 e600f124 2021-03-21 stsp goto done;
7618 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7619 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7621 0ebf8283 2019-07-24 stsp goto done;
7623 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7625 0ebf8283 2019-07-24 stsp goto done;
7627 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7629 0ebf8283 2019-07-24 stsp goto done;
7631 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7633 0ebf8283 2019-07-24 stsp goto done;
7635 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7637 a615e0e7 2020-12-16 stsp goto done;
7639 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7641 a615e0e7 2020-12-16 stsp goto done;
7642 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7643 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7644 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7645 a615e0e7 2020-12-16 stsp err = sync_err;
7647 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7648 a615e0e7 2020-12-16 stsp free(fileindex_path);
7649 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7650 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7651 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7652 0ebf8283 2019-07-24 stsp err = unlockerr;
7653 0ebf8283 2019-07-24 stsp return err;
7656 0ebf8283 2019-07-24 stsp const struct got_error *
7657 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7658 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7660 0ebf8283 2019-07-24 stsp const struct got_error *err;
7661 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7663 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7665 0ebf8283 2019-07-24 stsp return err;
7667 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7669 0ebf8283 2019-07-24 stsp goto done;
7671 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7673 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7674 2822a352 2019-10-15 stsp return err;
7677 2822a352 2019-10-15 stsp const struct got_error *
7678 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7679 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7680 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7681 2822a352 2019-10-15 stsp struct got_repository *repo)
7683 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7684 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7685 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7687 2822a352 2019-10-15 stsp *fileindex = NULL;
7688 2822a352 2019-10-15 stsp *branch_ref = NULL;
7689 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7691 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7693 2822a352 2019-10-15 stsp return err;
7695 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7696 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7697 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7698 2822a352 2019-10-15 stsp "update -b or different branch name required");
7699 2822a352 2019-10-15 stsp goto done;
7702 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7704 2822a352 2019-10-15 stsp goto done;
7706 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7707 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7708 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7709 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7712 2822a352 2019-10-15 stsp goto done;
7714 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7716 2822a352 2019-10-15 stsp goto done;
7718 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7719 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7721 2822a352 2019-10-15 stsp if (err) {
7722 2822a352 2019-10-15 stsp if (*branch_ref) {
7723 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7724 2822a352 2019-10-15 stsp *branch_ref = NULL;
7726 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7727 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7728 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7730 2822a352 2019-10-15 stsp if (*fileindex) {
7731 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7732 2822a352 2019-10-15 stsp *fileindex = NULL;
7734 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7736 0cb83759 2019-08-03 stsp return err;
7739 2822a352 2019-10-15 stsp const struct got_error *
7740 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7741 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7742 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7743 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7744 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7746 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7747 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7748 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7749 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7751 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7753 2822a352 2019-10-15 stsp goto done;
7755 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7757 2822a352 2019-10-15 stsp goto done;
7759 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7761 a44927cc 2022-04-07 stsp goto done;
7763 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7764 2822a352 2019-10-15 stsp worktree->path_prefix);
7766 2822a352 2019-10-15 stsp goto done;
7768 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7770 2822a352 2019-10-15 stsp goto done;
7772 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7773 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7775 2822a352 2019-10-15 stsp goto sync;
7777 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7779 2822a352 2019-10-15 stsp goto sync;
7781 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7783 6e210706 2021-01-22 stsp goto sync;
7785 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7787 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7788 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7789 2822a352 2019-10-15 stsp err = sync_err;
7792 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7793 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7794 2822a352 2019-10-15 stsp err = unlockerr;
7795 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7797 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7798 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7799 2822a352 2019-10-15 stsp err = unlockerr;
7800 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7802 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7803 2822a352 2019-10-15 stsp free(fileindex_path);
7804 2822a352 2019-10-15 stsp free(tree_id);
7805 a44927cc 2022-04-07 stsp if (commit)
7806 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7808 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7809 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7810 2822a352 2019-10-15 stsp err = unlockerr;
7811 2822a352 2019-10-15 stsp return err;
7814 2822a352 2019-10-15 stsp const struct got_error *
7815 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7816 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7817 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7819 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7821 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7823 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7825 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7826 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7827 8b692cd0 2019-10-21 stsp err = unlockerr;
7828 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7830 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7831 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7832 8b692cd0 2019-10-21 stsp err = unlockerr;
7833 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7835 f259c4c1 2021-09-24 stsp return err;
7838 f259c4c1 2021-09-24 stsp const struct got_error *
7839 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7840 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7842 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7843 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7845 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7847 f259c4c1 2021-09-24 stsp goto done;
7849 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7851 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7852 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7853 f259c4c1 2021-09-24 stsp err = sync_err;
7855 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7856 f259c4c1 2021-09-24 stsp free(fileindex_path);
7857 8b692cd0 2019-10-21 stsp return err;
7860 f259c4c1 2021-09-24 stsp static const struct got_error *
7861 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7863 f259c4c1 2021-09-24 stsp const struct got_error *err;
7864 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7866 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7868 f259c4c1 2021-09-24 stsp goto done;
7869 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7871 f259c4c1 2021-09-24 stsp goto done;
7873 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7875 f259c4c1 2021-09-24 stsp goto done;
7876 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7878 f259c4c1 2021-09-24 stsp goto done;
7881 f259c4c1 2021-09-24 stsp free(branch_refname);
7882 f259c4c1 2021-09-24 stsp free(commit_refname);
7883 f259c4c1 2021-09-24 stsp return err;
7886 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7887 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7888 f259c4c1 2021-09-24 stsp const char *branch_name;
7891 f259c4c1 2021-09-24 stsp static const struct got_error *
7892 2a47b1e5 2022-11-01 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7893 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
7895 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7897 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7898 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7899 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7901 f259c4c1 2021-09-24 stsp return NULL;
7905 f259c4c1 2021-09-24 stsp const struct got_error *
7906 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7907 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7908 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7909 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7910 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7911 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7913 f259c4c1 2021-09-24 stsp const struct got_error *err;
7914 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7916 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7918 f259c4c1 2021-09-24 stsp goto done;
7920 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7921 f259c4c1 2021-09-24 stsp worktree);
7923 f259c4c1 2021-09-24 stsp goto done;
7925 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7926 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7927 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7929 f259c4c1 2021-09-24 stsp free(fileindex_path);
7930 f259c4c1 2021-09-24 stsp return err;
7933 f259c4c1 2021-09-24 stsp const struct got_error *
7934 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7935 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7936 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7937 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7938 12383673 2023-02-18 mark int allow_conflict, struct got_repository *repo,
7939 0ff8d236 2021-09-28 stsp got_worktree_status_cb status_cb, void *status_arg)
7942 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7943 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7944 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7945 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7946 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7947 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7948 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7949 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7950 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7952 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
7953 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7955 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7957 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7959 f259c4c1 2021-09-24 stsp goto done;
7961 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7963 f259c4c1 2021-09-24 stsp goto done;
7965 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7967 f259c4c1 2021-09-24 stsp goto done;
7969 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7970 f259c4c1 2021-09-24 stsp &have_staged_files);
7971 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7972 f259c4c1 2021-09-24 stsp goto done;
7973 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7974 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7975 f259c4c1 2021-09-24 stsp goto done;
7978 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7979 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7980 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7981 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7982 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7983 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7984 12383673 2023-02-18 mark cc_arg.commit_conflicts = allow_conflict;
7985 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7986 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7988 f259c4c1 2021-09-24 stsp goto done;
7990 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7991 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7992 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7993 f259c4c1 2021-09-24 stsp goto done;
7996 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7997 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7998 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
8000 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
8001 f259c4c1 2021-09-24 stsp ct_path++;
8002 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
8003 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
8004 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
8006 f259c4c1 2021-09-24 stsp goto done;
8010 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
8011 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
8012 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
8013 2a47b1e5 2022-11-01 stsp head_commit_id, branch_tip, worktree, author, committer, NULL,
8014 0ff8d236 2021-09-28 stsp merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
8016 f259c4c1 2021-09-24 stsp goto done;
8018 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
8019 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
8020 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8021 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8022 f259c4c1 2021-09-24 stsp err = sync_err;
8024 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
8025 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
8027 f259c4c1 2021-09-24 stsp free_commitable(ct);
8029 d8bacb93 2023-01-10 mark got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
8030 f259c4c1 2021-09-24 stsp free(fileindex_path);
8031 f259c4c1 2021-09-24 stsp return err;
8034 f259c4c1 2021-09-24 stsp const struct got_error *
8035 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
8036 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
8038 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
8039 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8041 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
8043 f259c4c1 2021-09-24 stsp goto done;
8045 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
8047 f259c4c1 2021-09-24 stsp goto done;
8048 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8049 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8050 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8051 f259c4c1 2021-09-24 stsp err = sync_err;
8053 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
8054 f259c4c1 2021-09-24 stsp free(fileindex_path);
8055 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8056 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
8057 f259c4c1 2021-09-24 stsp err = unlockerr;
8058 f259c4c1 2021-09-24 stsp return err;
8061 f259c4c1 2021-09-24 stsp const struct got_error *
8062 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
8063 f259c4c1 2021-09-24 stsp struct got_repository *repo)
8065 f259c4c1 2021-09-24 stsp const struct got_error *err;
8066 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
8067 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
8069 f259c4c1 2021-09-24 stsp *in_progress = 0;
8071 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8073 f259c4c1 2021-09-24 stsp return err;
8074 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8075 793fcac3 2021-09-24 stsp free(branch_refname);
8076 f259c4c1 2021-09-24 stsp if (err) {
8077 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
8078 f259c4c1 2021-09-24 stsp return err;
8080 f259c4c1 2021-09-24 stsp *in_progress = 1;
8082 f259c4c1 2021-09-24 stsp return NULL;
8085 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
8086 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
8087 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
8089 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
8090 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8091 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
8092 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8093 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
8094 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8095 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
8097 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8099 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8101 f259c4c1 2021-09-24 stsp return err;
8103 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8105 f259c4c1 2021-09-24 stsp goto done;
8107 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
8108 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
8109 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
8110 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8113 f259c4c1 2021-09-24 stsp goto done;
8115 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8117 f259c4c1 2021-09-24 stsp return err;
8119 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8121 f259c4c1 2021-09-24 stsp return err;
8123 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8126 f259c4c1 2021-09-24 stsp goto done;
8128 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8130 f259c4c1 2021-09-24 stsp goto done;
8132 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8133 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8134 f259c4c1 2021-09-24 stsp goto done;
8137 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
8139 f259c4c1 2021-09-24 stsp goto done;
8141 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8143 f259c4c1 2021-09-24 stsp goto done;
8144 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
8146 f259c4c1 2021-09-24 stsp goto done;
8148 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8150 f259c4c1 2021-09-24 stsp goto done;
8151 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
8153 f259c4c1 2021-09-24 stsp goto done;
8156 f259c4c1 2021-09-24 stsp free(branch_refname);
8157 f259c4c1 2021-09-24 stsp free(commit_refname);
8158 f259c4c1 2021-09-24 stsp free(fileindex_path);
8159 f259c4c1 2021-09-24 stsp if (branch_ref)
8160 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8161 f259c4c1 2021-09-24 stsp if (commit_ref)
8162 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8163 f259c4c1 2021-09-24 stsp if (wt_branch)
8164 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
8165 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
8166 f259c4c1 2021-09-24 stsp if (err) {
8167 f259c4c1 2021-09-24 stsp if (*fileindex) {
8168 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8169 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8171 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8173 f259c4c1 2021-09-24 stsp return err;
8176 f259c4c1 2021-09-24 stsp const struct got_error *
8177 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
8178 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8179 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8181 f259c4c1 2021-09-24 stsp const struct got_error *err;
8182 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
8183 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8184 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8185 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
8187 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8188 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8189 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8191 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8193 f259c4c1 2021-09-24 stsp return err;
8195 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8197 f259c4c1 2021-09-24 stsp goto done;
8199 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8200 f259c4c1 2021-09-24 stsp &have_staged_files);
8201 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
8202 f259c4c1 2021-09-24 stsp goto done;
8203 f259c4c1 2021-09-24 stsp if (have_staged_files) {
8204 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
8205 f259c4c1 2021-09-24 stsp goto done;
8208 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8210 f259c4c1 2021-09-24 stsp goto done;
8212 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8214 f259c4c1 2021-09-24 stsp goto done;
8216 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8218 f259c4c1 2021-09-24 stsp goto done;
8220 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
8221 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8222 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
8223 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
8224 f259c4c1 2021-09-24 stsp goto done;
8226 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8227 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
8228 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
8229 f259c4c1 2021-09-24 stsp goto done;
8232 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8234 f259c4c1 2021-09-24 stsp goto done;
8236 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
8238 f259c4c1 2021-09-24 stsp goto done;
8240 f259c4c1 2021-09-24 stsp free(commit_refname);
8241 f259c4c1 2021-09-24 stsp free(branch_refname);
8242 f259c4c1 2021-09-24 stsp free(fileindex_path);
8243 f259c4c1 2021-09-24 stsp if (commit_ref)
8244 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8245 f259c4c1 2021-09-24 stsp if (branch_ref)
8246 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8247 f259c4c1 2021-09-24 stsp if (err) {
8248 f259c4c1 2021-09-24 stsp if (*branch_name) {
8249 f259c4c1 2021-09-24 stsp free(*branch_name);
8250 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8252 f259c4c1 2021-09-24 stsp free(*branch_tip);
8253 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8254 f259c4c1 2021-09-24 stsp if (*fileindex) {
8255 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8256 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8258 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8260 f259c4c1 2021-09-24 stsp return err;
8263 f259c4c1 2021-09-24 stsp const struct got_error *
8264 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
8265 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
8266 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8268 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
8269 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
8270 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
8271 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8272 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
8273 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
8275 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
8276 a44927cc 2022-04-07 stsp worktree->base_commit_id);
8278 a44927cc 2022-04-07 stsp goto done;
8280 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
8281 a44927cc 2022-04-07 stsp worktree->path_prefix);
8283 f259c4c1 2021-09-24 stsp goto done;
8285 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
8287 f259c4c1 2021-09-24 stsp goto done;
8289 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
8291 f259c4c1 2021-09-24 stsp goto done;
8293 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
8294 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
8295 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
8296 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
8297 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
8298 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
8299 f259c4c1 2021-09-24 stsp rfa.repo = repo;
8300 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
8301 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
8302 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
8304 f259c4c1 2021-09-24 stsp goto sync;
8306 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8307 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
8309 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8310 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8311 f259c4c1 2021-09-24 stsp err = sync_err;
8313 f259c4c1 2021-09-24 stsp free(tree_id);
8314 f259c4c1 2021-09-24 stsp free(commit_id);
8315 a44927cc 2022-04-07 stsp if (commit)
8316 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
8317 f259c4c1 2021-09-24 stsp if (fileindex)
8318 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
8319 f259c4c1 2021-09-24 stsp free(fileindex_path);
8321 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8322 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
8323 f259c4c1 2021-09-24 stsp err = unlockerr;
8324 f259c4c1 2021-09-24 stsp return err;
8327 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
8328 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
8329 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8330 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8331 2db2652d 2019-08-07 stsp struct got_repository *repo;
8332 2db2652d 2019-08-07 stsp int have_changes;
8335 336075a4 2022-06-25 op static const struct got_error *
8336 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
8337 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8338 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8339 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8341 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
8342 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
8343 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
8344 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
8345 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
8346 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
8348 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
8349 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
8350 8b13ce36 2019-08-08 stsp return NULL;
8351 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
8352 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
8354 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8355 735ef5ac 2019-08-03 stsp if (ie == NULL)
8356 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8358 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8359 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8360 735ef5ac 2019-08-03 stsp relpath) == -1)
8361 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
8363 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
8364 b4b2adf5 2023-02-09 op base_commit_idp = got_fileindex_entry_get_commit_id(
8365 b4b2adf5 2023-02-09 op &base_commit_id, ie);
8368 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
8369 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8370 3aa5969e 2019-08-06 stsp goto done;
8371 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
8372 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
8373 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
8374 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8375 735ef5ac 2019-08-03 stsp goto done;
8378 2db2652d 2019-08-07 stsp a->have_changes = 1;
8380 735ef5ac 2019-08-03 stsp p = in_repo_path;
8381 735ef5ac 2019-08-03 stsp while (p[0] == '/')
8383 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
8384 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
8385 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
8387 735ef5ac 2019-08-03 stsp free(in_repo_path);
8388 dc424a06 2019-08-07 stsp return err;
8391 2db2652d 2019-08-07 stsp struct stage_path_arg {
8392 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8393 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8394 2db2652d 2019-08-07 stsp struct got_repository *repo;
8395 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
8396 2db2652d 2019-08-07 stsp void *status_arg;
8397 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
8398 2db2652d 2019-08-07 stsp void *patch_arg;
8399 7b5dc508 2019-10-28 stsp int staged_something;
8400 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
8403 2db2652d 2019-08-07 stsp static const struct got_error *
8404 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
8405 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8406 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8407 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8409 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8410 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8411 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8412 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8413 0cb83759 2019-08-03 stsp uint32_t stage;
8414 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8415 0aeb8099 2020-07-23 stsp struct stat sb;
8417 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8418 8b13ce36 2019-08-08 stsp return NULL;
8420 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8421 d3e7c587 2019-08-03 stsp if (ie == NULL)
8422 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8424 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8425 2db2652d 2019-08-07 stsp relpath)== -1)
8426 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8428 0cb83759 2019-08-03 stsp switch (status) {
8429 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8430 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8431 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8432 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8433 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8436 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8437 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8438 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8439 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8440 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8443 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8446 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8447 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8448 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8449 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8450 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8454 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8455 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8458 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8459 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8460 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8461 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8463 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8464 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8465 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8466 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8467 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8468 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8469 35213c7c 2020-07-23 stsp ssize_t target_len;
8470 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8471 35213c7c 2020-07-23 stsp sizeof(target_path));
8472 35213c7c 2020-07-23 stsp if (target_len == -1) {
8473 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8474 35213c7c 2020-07-23 stsp ondisk_path);
8477 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8478 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8479 35213c7c 2020-07-23 stsp a->worktree->root_path);
8482 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8483 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8484 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8488 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8489 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8490 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8492 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8493 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8495 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8496 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8498 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8499 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8501 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8502 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8503 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8507 9fdde394 2022-06-04 op * When staging the reverse of the staged diff,
8508 9fdde394 2022-06-04 op * implicitly unstage the file.
8510 9fdde394 2022-06-04 op if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8511 9fdde394 2022-06-04 op sizeof(ie->blob_sha1)) == 0) {
8512 9fdde394 2022-06-04 op got_fileindex_entry_stage_set(ie,
8513 9fdde394 2022-06-04 op GOT_FILEIDX_STAGE_NONE);
8516 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8517 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8519 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8520 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8521 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8522 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8525 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8527 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8528 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8532 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8533 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8534 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8535 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8537 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8538 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8541 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8543 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8544 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8546 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8547 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8550 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8554 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8555 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8556 dc424a06 2019-08-07 stsp free(path_content);
8557 2db2652d 2019-08-07 stsp free(ondisk_path);
8558 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8559 0ebf8283 2019-07-24 stsp return err;
8562 0cb83759 2019-08-03 stsp const struct got_error *
8563 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8564 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8565 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8566 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8567 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8569 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8570 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8571 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8572 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8573 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8574 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8575 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8576 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8578 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8580 0cb83759 2019-08-03 stsp return err;
8582 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8583 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8585 735ef5ac 2019-08-03 stsp goto done;
8586 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8588 735ef5ac 2019-08-03 stsp goto done;
8589 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8591 0cb83759 2019-08-03 stsp goto done;
8593 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8594 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8595 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8596 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8597 2db2652d 2019-08-07 stsp oka.repo = repo;
8598 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8599 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8600 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8601 62da3196 2021-10-01 stsp check_stage_ok, &oka, NULL, NULL, 1, 0);
8603 735ef5ac 2019-08-03 stsp goto done;
8605 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8606 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8607 2db2652d 2019-08-07 stsp goto done;
8610 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8611 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8612 2db2652d 2019-08-07 stsp spa.repo = repo;
8613 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8614 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8615 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8616 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8617 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8618 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8619 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8620 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8621 62da3196 2021-10-01 stsp stage_path, &spa, NULL, NULL, 1, 0);
8623 2db2652d 2019-08-07 stsp goto done;
8625 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8626 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8627 7b5dc508 2019-10-28 stsp goto done;
8630 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8631 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8632 0cb83759 2019-08-03 stsp err = sync_err;
8634 735ef5ac 2019-08-03 stsp if (head_ref)
8635 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8636 735ef5ac 2019-08-03 stsp free(head_commit_id);
8637 0cb83759 2019-08-03 stsp free(fileindex_path);
8638 0cb83759 2019-08-03 stsp if (fileindex)
8639 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8640 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8641 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8642 0cb83759 2019-08-03 stsp err = unlockerr;
8643 0cb83759 2019-08-03 stsp return err;
8646 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8647 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8648 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8649 ad493afc 2019-08-03 stsp struct got_repository *repo;
8650 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8651 ad493afc 2019-08-03 stsp void *progress_arg;
8652 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8653 2e1f37b0 2019-08-08 stsp void *patch_arg;
8656 2e1f37b0 2019-08-08 stsp static const struct got_error *
8657 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8658 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8659 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8660 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8661 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8663 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8664 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8665 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8666 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8667 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8668 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8669 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8670 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8672 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8673 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8675 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8677 2e1f37b0 2019-08-08 stsp return err;
8679 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
8680 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
8681 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8682 eb81bc23 2022-06-28 tracey goto done;
8684 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
8685 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
8686 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8687 eb81bc23 2022-06-28 tracey goto done;
8690 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8692 2e1f37b0 2019-08-08 stsp goto done;
8694 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8696 2e1f37b0 2019-08-08 stsp goto done;
8698 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8700 2e1f37b0 2019-08-08 stsp goto done;
8702 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8705 2e1f37b0 2019-08-08 stsp goto done;
8707 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8709 2e1f37b0 2019-08-08 stsp goto done;
8711 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8713 2e1f37b0 2019-08-08 stsp goto done;
8715 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8716 4b752015 2022-06-30 stsp path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8718 2e1f37b0 2019-08-08 stsp goto done;
8720 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8721 b90054ed 2022-11-01 stsp "got-unstaged-content", "");
8723 2e1f37b0 2019-08-08 stsp goto done;
8724 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8725 b90054ed 2022-11-01 stsp "got-new-staged-content", "");
8727 2e1f37b0 2019-08-08 stsp goto done;
8729 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8730 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8731 2e1f37b0 2019-08-08 stsp goto done;
8733 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8734 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8735 2e1f37b0 2019-08-08 stsp goto done;
8737 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8738 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8739 eb81bc23 2022-06-28 tracey struct diff_chunk_context cc = {};
8740 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8741 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8742 fe621944 2020-11-10 stsp nchanges++;
8744 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8745 2e1f37b0 2019-08-08 stsp int choice;
8746 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8747 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8748 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8749 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8751 2e1f37b0 2019-08-08 stsp goto done;
8752 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8753 2e1f37b0 2019-08-08 stsp have_content = 1;
8755 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8756 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8759 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8760 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8761 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8763 2e1f37b0 2019-08-08 stsp free(label1);
8764 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8765 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8767 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8768 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8769 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8770 2e1f37b0 2019-08-08 stsp if (staged_blob)
8771 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8772 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8773 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8774 fe621944 2020-11-10 stsp err = free_err;
8775 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8776 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8777 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8778 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8779 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8780 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8781 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8782 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8783 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8784 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8785 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8786 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8787 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8788 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8789 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8790 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8791 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8792 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8793 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8795 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8796 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8797 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8798 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8799 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8800 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8801 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8803 2e1f37b0 2019-08-08 stsp free(path1);
8804 2e1f37b0 2019-08-08 stsp free(path2);
8805 fda8017d 2020-07-23 stsp return err;
8808 fda8017d 2020-07-23 stsp static const struct got_error *
8809 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8810 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8811 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8812 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8813 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8814 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8815 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8817 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8818 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8819 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8820 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8821 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8822 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8823 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8824 fda8017d 2020-07-23 stsp struct stat sb;
8826 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8827 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8828 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8830 fda8017d 2020-07-23 stsp return err;
8832 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8833 fda8017d 2020-07-23 stsp return NULL;
8835 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8836 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8837 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8839 fda8017d 2020-07-23 stsp goto done;
8842 00fe21f2 2021-12-31 stsp f = fopen(path_unstaged_content, "re");
8843 fda8017d 2020-07-23 stsp if (f == NULL) {
8844 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8845 fda8017d 2020-07-23 stsp path_unstaged_content);
8846 fda8017d 2020-07-23 stsp goto done;
8848 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8849 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8850 fda8017d 2020-07-23 stsp goto done;
8852 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8853 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8854 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8856 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8857 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8858 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8859 fda8017d 2020-07-23 stsp goto done;
8861 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8862 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8863 fda8017d 2020-07-23 stsp goto done;
8865 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8866 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8867 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8868 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8869 fda8017d 2020-07-23 stsp progress_arg);
8871 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8873 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8875 67a66647 2021-05-31 stsp return err;
8877 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8878 67a66647 2021-05-31 stsp parent) == -1) {
8879 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8880 67a66647 2021-05-31 stsp base_path = NULL;
8881 67a66647 2021-05-31 stsp goto done;
8884 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_base_path, &f_base,
8885 b90054ed 2022-11-01 stsp base_path, "");
8887 67a66647 2021-05-31 stsp goto done;
8888 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8889 67a66647 2021-05-31 stsp blob_base);
8891 67a66647 2021-05-31 stsp goto done;
8894 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8895 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8897 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8898 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8899 eec2f5a9 2021-06-03 stsp ondisk_path);
8901 eec2f5a9 2021-06-03 stsp goto done;
8904 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path,
8905 8bd0cdad 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8906 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8907 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8908 eec2f5a9 2021-06-03 stsp goto done;
8910 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8911 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8912 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8913 eec2f5a9 2021-06-03 stsp close(fd);
8914 eec2f5a9 2021-06-03 stsp goto done;
8918 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8919 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8920 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8921 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8922 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8925 fda8017d 2020-07-23 stsp goto done;
8927 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8928 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8929 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8931 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8932 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8935 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8936 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8937 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8938 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8939 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8940 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8941 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8942 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8943 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8944 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8945 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8946 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8947 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8948 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8949 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8950 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8951 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8952 67a66647 2021-05-31 stsp free(blob_base_path);
8953 67a66647 2021-05-31 stsp free(parent);
8954 67a66647 2021-05-31 stsp free(base_path);
8955 2e1f37b0 2019-08-08 stsp return err;
8958 ad493afc 2019-08-03 stsp static const struct got_error *
8959 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8960 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8961 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8962 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8964 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8965 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8966 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8967 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8968 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8969 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8970 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8971 9bc94a15 2019-08-03 stsp struct stat sb;
8972 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8974 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8975 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8976 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8977 2e1f37b0 2019-08-08 stsp return NULL;
8979 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8980 ad493afc 2019-08-03 stsp if (ie == NULL)
8981 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8983 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8985 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8987 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8988 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8990 f69721c3 2019-10-21 stsp goto done;
8991 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8992 f69721c3 2019-10-21 stsp id_str) == -1) {
8993 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8994 eb81bc23 2022-06-28 tracey goto done;
8997 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
8998 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
8999 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
9000 eb81bc23 2022-06-28 tracey goto done;
9002 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
9003 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
9004 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
9005 f69721c3 2019-10-21 stsp goto done;
9008 ad493afc 2019-08-03 stsp switch (staged_status) {
9009 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
9010 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
9011 eb81bc23 2022-06-28 tracey blob_id, 8192, fd1);
9014 ad493afc 2019-08-03 stsp /* fall through */
9015 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
9016 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
9017 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
9018 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
9019 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
9020 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9023 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
9026 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
9027 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
9028 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
9029 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
9030 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
9031 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
9034 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
9035 eb81bc23 2022-06-28 tracey staged_blob_id, 8192, fd2);
9038 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
9039 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
9040 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
9041 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
9042 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
9043 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
9044 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
9045 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
9046 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
9048 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
9049 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
9050 36bf999c 2020-07-23 stsp char *staged_target;
9051 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
9052 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
9054 36bf999c 2020-07-23 stsp goto done;
9055 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
9056 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
9057 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
9058 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
9059 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
9060 36bf999c 2020-07-23 stsp free(staged_target);
9062 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
9063 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
9064 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
9065 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
9066 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
9067 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
9068 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
9072 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
9075 2ac8aa02 2020-11-09 stsp if (err == NULL) {
9076 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
9077 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
9078 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9081 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
9082 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
9083 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
9084 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
9085 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9088 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
9090 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
9091 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
9095 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9096 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9097 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
9098 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
9101 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
9105 ad493afc 2019-08-03 stsp free(ondisk_path);
9106 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9107 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9108 ad493afc 2019-08-03 stsp if (blob_base)
9109 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
9110 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9111 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9112 ad493afc 2019-08-03 stsp if (blob_staged)
9113 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
9114 f69721c3 2019-10-21 stsp free(id_str);
9115 f69721c3 2019-10-21 stsp free(label_orig);
9116 ad493afc 2019-08-03 stsp return err;
9119 ad493afc 2019-08-03 stsp const struct got_error *
9120 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
9121 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
9122 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
9123 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
9124 ad493afc 2019-08-03 stsp struct got_repository *repo)
9126 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
9127 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9128 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
9129 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
9130 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
9132 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
9134 ad493afc 2019-08-03 stsp return err;
9136 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9138 ad493afc 2019-08-03 stsp goto done;
9140 ad493afc 2019-08-03 stsp upa.worktree = worktree;
9141 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
9142 ad493afc 2019-08-03 stsp upa.repo = repo;
9143 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
9144 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
9145 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
9146 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
9147 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
9148 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
9149 62da3196 2021-10-01 stsp unstage_path, &upa, NULL, NULL, 1, 0);
9151 ad493afc 2019-08-03 stsp goto done;
9154 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
9155 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
9156 ad493afc 2019-08-03 stsp err = sync_err;
9158 ad493afc 2019-08-03 stsp free(fileindex_path);
9159 ad493afc 2019-08-03 stsp if (fileindex)
9160 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
9161 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
9162 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
9163 ad493afc 2019-08-03 stsp err = unlockerr;
9164 ad493afc 2019-08-03 stsp return err;
9167 b2118c49 2020-07-28 stsp struct report_file_info_arg {
9168 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
9169 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
9170 b2118c49 2020-07-28 stsp void *info_arg;
9171 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
9172 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
9173 b2118c49 2020-07-28 stsp void *cancel_arg;
9176 b2118c49 2020-07-28 stsp static const struct got_error *
9177 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
9179 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
9180 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9181 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
9182 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9183 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
9184 b2118c49 2020-07-28 stsp int stage;
9186 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9187 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
9189 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
9190 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9191 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
9194 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
9195 b2118c49 2020-07-28 stsp return NULL;
9197 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_blob(ie))
9198 b4b2adf5 2023-02-09 op blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
9199 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
9200 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9201 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
9202 b4b2adf5 2023-02-09 op staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
9203 b4b2adf5 2023-02-09 op &staged_blob_id, ie);
9206 b4b2adf5 2023-02-09 op if (got_fileindex_entry_has_commit(ie))
9207 b4b2adf5 2023-02-09 op commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
9209 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9210 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9213 b2118c49 2020-07-28 stsp const struct got_error *
9214 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
9215 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
9216 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
9217 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
9220 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
9221 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
9222 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
9223 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
9225 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
9227 b2118c49 2020-07-28 stsp return err;
9229 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9231 b2118c49 2020-07-28 stsp goto done;
9233 b2118c49 2020-07-28 stsp arg.worktree = worktree;
9234 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
9235 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
9236 b2118c49 2020-07-28 stsp arg.paths = paths;
9237 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
9238 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
9239 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9242 b2118c49 2020-07-28 stsp free(fileindex_path);
9243 b2118c49 2020-07-28 stsp if (fileindex)
9244 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
9245 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
9246 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
9247 b2118c49 2020-07-28 stsp err = unlockerr;
9248 b2118c49 2020-07-28 stsp return err;
9251 78f5ac24 2022-03-19 op static const struct got_error *
9252 78f5ac24 2022-03-19 op patch_check_path(const char *p, char **path, unsigned char *status,
9253 78f5ac24 2022-03-19 op unsigned char *staged_status, struct got_fileindex *fileindex,
9254 78f5ac24 2022-03-19 op struct got_worktree *worktree, struct got_repository *repo)
9256 78f5ac24 2022-03-19 op const struct got_error *err;
9257 78f5ac24 2022-03-19 op struct got_fileindex_entry *ie;
9258 78f5ac24 2022-03-19 op struct stat sb;
9259 78f5ac24 2022-03-19 op char *ondisk_path = NULL;
9261 78f5ac24 2022-03-19 op err = got_worktree_resolve_path(path, worktree, p);
9265 78f5ac24 2022-03-19 op if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9266 78f5ac24 2022-03-19 op *path[0] ? "/" : "", *path) == -1)
9267 78f5ac24 2022-03-19 op return got_error_from_errno("asprintf");
9269 78f5ac24 2022-03-19 op ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9271 78f5ac24 2022-03-19 op *staged_status = get_staged_status(ie);
9272 a05fb460 2022-04-23 op err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9277 78f5ac24 2022-03-19 op *staged_status = GOT_STATUS_NO_CHANGE;
9278 78f5ac24 2022-03-19 op *status = GOT_STATUS_UNVERSIONED;
9279 78f5ac24 2022-03-19 op if (lstat(ondisk_path, &sb) == -1) {
9280 78f5ac24 2022-03-19 op if (errno != ENOENT) {
9281 78f5ac24 2022-03-19 op err = got_error_from_errno2("lstat",
9282 78f5ac24 2022-03-19 op ondisk_path);
9285 78f5ac24 2022-03-19 op *status = GOT_STATUS_NONEXISTENT;
9290 78f5ac24 2022-03-19 op free(ondisk_path);
9294 78f5ac24 2022-03-19 op static const struct got_error *
9295 78f5ac24 2022-03-19 op patch_can_rm(const char *path, unsigned char status,
9296 78f5ac24 2022-03-19 op unsigned char staged_status)
9298 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9299 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9300 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9301 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9302 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY &&
9303 78f5ac24 2022-03-19 op status != GOT_STATUS_MODE_CHANGE)
9304 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9305 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9306 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9307 78f5ac24 2022-03-19 op return NULL;
9310 78f5ac24 2022-03-19 op static const struct got_error *
9311 78f5ac24 2022-03-19 op patch_can_add(const char *path, unsigned char status)
9313 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NONEXISTENT)
9314 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9315 78f5ac24 2022-03-19 op return NULL;
9318 78f5ac24 2022-03-19 op static const struct got_error *
9319 78f5ac24 2022-03-19 op patch_can_edit(const char *path, unsigned char status,
9320 78f5ac24 2022-03-19 op unsigned char staged_status)
9322 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9323 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9324 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9325 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9326 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY)
9327 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9328 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9329 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9330 78f5ac24 2022-03-19 op return NULL;
9333 78f5ac24 2022-03-19 op const struct got_error *
9334 78f5ac24 2022-03-19 op got_worktree_patch_prepare(struct got_fileindex **fileindex,
9335 f2dd7807 2022-05-17 op char **fileindex_path, struct got_worktree *worktree)
9337 f2dd7807 2022-05-17 op return open_fileindex(fileindex, fileindex_path, worktree);
9340 78f5ac24 2022-03-19 op const struct got_error *
9341 78f5ac24 2022-03-19 op got_worktree_patch_check_path(const char *old, const char *new,
9342 78f5ac24 2022-03-19 op char **oldpath, char **newpath, struct got_worktree *worktree,
9343 78f5ac24 2022-03-19 op struct got_repository *repo, struct got_fileindex *fileindex)
9345 78f5ac24 2022-03-19 op const struct got_error *err = NULL;
9346 78f5ac24 2022-03-19 op int file_renamed = 0;
9347 78f5ac24 2022-03-19 op unsigned char status_old, staged_status_old;
9348 78f5ac24 2022-03-19 op unsigned char status_new, staged_status_new;
9350 78f5ac24 2022-03-19 op *oldpath = NULL;
9351 78f5ac24 2022-03-19 op *newpath = NULL;
9353 78f5ac24 2022-03-19 op err = patch_check_path(old != NULL ? old : new, oldpath,
9354 78f5ac24 2022-03-19 op &status_old, &staged_status_old, fileindex, worktree, repo);
9358 78f5ac24 2022-03-19 op err = patch_check_path(new != NULL ? new : old, newpath,
9359 78f5ac24 2022-03-19 op &status_new, &staged_status_new, fileindex, worktree, repo);
9363 78f5ac24 2022-03-19 op if (old != NULL && new != NULL && strcmp(old, new) != 0)
9364 78f5ac24 2022-03-19 op file_renamed = 1;
9366 78f5ac24 2022-03-19 op if (old != NULL && new == NULL)
9367 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9368 78f5ac24 2022-03-19 op else if (file_renamed) {
9369 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9370 78f5ac24 2022-03-19 op if (err == NULL)
9371 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9372 78f5ac24 2022-03-19 op } else if (old == NULL)
9373 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9375 78f5ac24 2022-03-19 op err = patch_can_edit(*newpath, status_new, staged_status_new);
9379 78f5ac24 2022-03-19 op free(*oldpath);
9380 78f5ac24 2022-03-19 op *oldpath = NULL;
9381 78f5ac24 2022-03-19 op free(*newpath);
9382 78f5ac24 2022-03-19 op *newpath = NULL;
9387 78f5ac24 2022-03-19 op const struct got_error *
9388 f2dd7807 2022-05-17 op got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9389 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9390 f2dd7807 2022-05-17 op got_worktree_checkout_cb progress_cb, void *progress_arg)
9392 f2dd7807 2022-05-17 op struct schedule_addition_args saa;
9394 f2dd7807 2022-05-17 op memset(&saa, 0, sizeof(saa));
9395 f2dd7807 2022-05-17 op saa.worktree = worktree;
9396 f2dd7807 2022-05-17 op saa.fileindex = fileindex;
9397 f2dd7807 2022-05-17 op saa.progress_cb = progress_cb;
9398 f2dd7807 2022-05-17 op saa.progress_arg = progress_arg;
9399 f2dd7807 2022-05-17 op saa.repo = repo;
9401 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9402 f2dd7807 2022-05-17 op schedule_addition, &saa, NULL, NULL, 1, 0);
9405 f2dd7807 2022-05-17 op const struct got_error *
9406 f2dd7807 2022-05-17 op got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9407 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9408 f2dd7807 2022-05-17 op got_worktree_delete_cb progress_cb, void *progress_arg)
9410 f2dd7807 2022-05-17 op struct schedule_deletion_args sda;
9412 f2dd7807 2022-05-17 op memset(&sda, 0, sizeof(sda));
9413 f2dd7807 2022-05-17 op sda.worktree = worktree;
9414 f2dd7807 2022-05-17 op sda.fileindex = fileindex;
9415 f2dd7807 2022-05-17 op sda.progress_cb = progress_cb;
9416 f2dd7807 2022-05-17 op sda.progress_arg = progress_arg;
9417 f2dd7807 2022-05-17 op sda.repo = repo;
9418 f2dd7807 2022-05-17 op sda.delete_local_mods = 0;
9419 f2dd7807 2022-05-17 op sda.keep_on_disk = 0;
9420 f2dd7807 2022-05-17 op sda.ignore_missing_paths = 0;
9421 f2dd7807 2022-05-17 op sda.status_codes = NULL;
9423 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9424 f2dd7807 2022-05-17 op schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9427 f2dd7807 2022-05-17 op const struct got_error *
9428 f2dd7807 2022-05-17 op got_worktree_patch_complete(struct got_fileindex *fileindex,
9429 4bcdc895 2022-05-17 op const char *fileindex_path)
9431 f2dd7807 2022-05-17 op const struct got_error *err = NULL;
9433 4bcdc895 2022-05-17 op err = sync_fileindex(fileindex, fileindex_path);
9434 4bcdc895 2022-05-17 op got_fileindex_free(fileindex);
