2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
19 d1f6d47b 2019-02-04 stsp #include <dirent.h>
20 12ce7a6c 2019-08-12 stsp #include <limits.h>
21 f5c49f82 2019-01-06 stsp #include <stddef.h>
22 86c3caaf 2018-03-09 stsp #include <string.h>
23 86c3caaf 2018-03-09 stsp #include <stdio.h>
24 86c3caaf 2018-03-09 stsp #include <stdlib.h>
25 303e14b5 2019-09-23 stsp #include <time.h>
26 86c3caaf 2018-03-09 stsp #include <fcntl.h>
27 86c3caaf 2018-03-09 stsp #include <errno.h>
28 86c3caaf 2018-03-09 stsp #include <unistd.h>
29 9d31a1d8 2018-03-11 stsp #include <zlib.h>
30 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
31 512f0d0e 2019-01-02 stsp #include <libgen.h>
33 dd038bc6 2021-09-21 thomas.ad #include "got_compat.h"
35 86c3caaf 2018-03-09 stsp #include "got_error.h"
36 86c3caaf 2018-03-09 stsp #include "got_repository.h"
37 5261c201 2018-04-01 stsp #include "got_reference.h"
38 9d31a1d8 2018-03-11 stsp #include "got_object.h"
39 1dd54920 2019-05-11 stsp #include "got_path.h"
40 e6209546 2019-08-22 stsp #include "got_cancel.h"
41 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
42 511a516b 2018-05-19 stsp #include "got_opentemp.h"
43 234035bc 2019-06-01 stsp #include "got_diff.h"
45 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
48 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
51 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
52 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
53 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
54 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
55 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
58 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
62 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
64 99724ed4 2018-03-10 stsp static const struct got_error *
65 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
67 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
70 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
71 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
73 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
78 507dc3bb 2018-12-29 stsp static const struct got_error *
79 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
81 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
82 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
83 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
84 507dc3bb 2018-12-29 stsp char *path = NULL;
86 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
87 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
88 507dc3bb 2018-12-29 stsp path = NULL;
92 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
96 507dc3bb 2018-12-29 stsp if (content) {
97 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
98 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
99 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
104 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
105 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
106 2a57020b 2019-02-20 stsp unlink(tmppath);
111 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
112 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
113 230a42bd 2019-05-11 jcs free(tmppath);
114 09fe317a 2018-03-11 stsp return err;
117 024e9686 2019-05-14 stsp static const struct got_error *
118 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
120 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
121 024e9686 2019-05-14 stsp char *refstr = NULL;
123 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
124 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
125 024e9686 2019-05-14 stsp if (refstr == NULL)
126 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
128 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
129 024e9686 2019-05-14 stsp if (refstr == NULL)
130 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
132 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
133 024e9686 2019-05-14 stsp free(refstr);
134 024e9686 2019-05-14 stsp return err;
137 86c3caaf 2018-03-09 stsp const struct got_error *
138 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
139 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
141 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
142 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
143 ec22038e 2019-03-10 stsp uuid_t uuid;
144 ec22038e 2019-03-10 stsp uint32_t uuid_status;
145 65596e15 2018-12-24 stsp int obj_type;
146 7ac97322 2018-03-11 stsp char *path_got = NULL;
147 1451e70d 2018-03-10 stsp char *formatstr = NULL;
148 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
149 65596e15 2018-12-24 stsp char *basestr = NULL;
150 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
152 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
153 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
157 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
159 65596e15 2018-12-24 stsp return err;
160 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
162 65596e15 2018-12-24 stsp return err;
163 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
164 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
166 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
167 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
168 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
171 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
172 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
173 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
177 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
178 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
179 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
182 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
183 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
187 056e7441 2018-03-11 stsp /* Create an empty lock file. */
188 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
192 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
193 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
197 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
198 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
202 65596e15 2018-12-24 stsp /* Record our base commit. */
203 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
206 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
210 1451e70d 2018-03-10 stsp /* Store path to repository. */
211 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
212 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
216 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
217 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
218 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
222 ec22038e 2019-03-10 stsp /* Generate UUID. */
223 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
224 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
225 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
228 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
229 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
230 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
233 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
237 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
238 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
239 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
242 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
247 65596e15 2018-12-24 stsp free(commit_id);
248 7ac97322 2018-03-11 stsp free(path_got);
249 1451e70d 2018-03-10 stsp free(formatstr);
250 0bb8a95e 2018-03-12 stsp free(absprefix);
251 65596e15 2018-12-24 stsp free(basestr);
252 ec22038e 2019-03-10 stsp free(uuidstr);
253 86c3caaf 2018-03-09 stsp return err;
256 247140b2 2019-02-05 stsp const struct got_error *
257 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
258 e5dc7198 2018-12-29 stsp const char *path_prefix)
260 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
262 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
263 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
264 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
266 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
267 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
268 e5dc7198 2018-12-29 stsp free(absprefix);
269 e5dc7198 2018-12-29 stsp return NULL;
272 bc70eb79 2019-05-09 stsp const char *
273 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
275 36a38700 2019-05-10 stsp return worktree->head_ref_name;
278 024e9686 2019-05-14 stsp const struct got_error *
279 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
280 024e9686 2019-05-14 stsp struct got_reference *head_ref)
282 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
283 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
285 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
286 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
287 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
288 024e9686 2019-05-14 stsp path_got = NULL;
292 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
293 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
294 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
298 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
302 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
303 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
305 024e9686 2019-05-14 stsp free(path_got);
307 024e9686 2019-05-14 stsp free(head_ref_name);
308 024e9686 2019-05-14 stsp return err;
311 b72f483a 2019-02-05 stsp struct got_object_id *
312 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
314 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
317 507dc3bb 2018-12-29 stsp const struct got_error *
318 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
319 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
321 507dc3bb 2018-12-29 stsp const struct got_error *err;
322 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
323 507dc3bb 2018-12-29 stsp char *id_str = NULL;
324 507dc3bb 2018-12-29 stsp char *path_got = NULL;
326 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
327 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
328 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
329 507dc3bb 2018-12-29 stsp path_got = NULL;
333 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
335 507dc3bb 2018-12-29 stsp return err;
337 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
338 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
342 507dc3bb 2018-12-29 stsp /* Record our base commit. */
343 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
346 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
350 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
351 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
352 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
353 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
358 507dc3bb 2018-12-29 stsp got_object_close(obj);
359 507dc3bb 2018-12-29 stsp free(id_str);
360 507dc3bb 2018-12-29 stsp free(path_got);
361 507dc3bb 2018-12-29 stsp return err;
364 50b0790e 2020-09-11 stsp const struct got_gotconfig *
365 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
367 50b0790e 2020-09-11 stsp return worktree->gotconfig;
370 9d31a1d8 2018-03-11 stsp static const struct got_error *
371 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
373 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
374 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
375 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
376 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
377 86c3caaf 2018-03-09 stsp return NULL;
380 21908da4 2019-01-13 stsp static const struct got_error *
381 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
383 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
384 4a1ddfc2 2019-01-12 stsp char *abspath;
386 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
387 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
389 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
390 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
391 ddcd8544 2019-03-11 stsp struct stat sb;
392 ddcd8544 2019-03-11 stsp err = NULL;
393 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
394 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
395 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
396 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
397 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
400 4a1ddfc2 2019-01-12 stsp free(abspath);
401 68c76935 2019-02-19 stsp return err;
404 68c76935 2019-02-19 stsp static const struct got_error *
405 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
407 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
408 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
409 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
410 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
415 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
416 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
417 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
420 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
421 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
422 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
425 68c76935 2019-02-19 stsp if (flen1 == 0) {
426 68c76935 2019-02-19 stsp if (flen2 != 0)
429 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
430 68c76935 2019-02-19 stsp if (flen1 != 0)
433 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
434 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
444 68c76935 2019-02-19 stsp return err;
447 68c76935 2019-02-19 stsp static const struct got_error *
448 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
450 68c76935 2019-02-19 stsp struct stat sb;
451 68c76935 2019-02-19 stsp size_t size1, size2;
455 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
456 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
457 68c76935 2019-02-19 stsp size1 = sb.st_size;
459 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
460 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
461 68c76935 2019-02-19 stsp size2 = sb.st_size;
463 68c76935 2019-02-19 stsp if (size1 != size2) {
465 68c76935 2019-02-19 stsp return NULL;
468 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
469 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
470 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
471 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
473 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
476 24f136e0 2021-11-20 thomas static const struct got_error *
477 24f136e0 2021-11-20 thomas copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
479 24f136e0 2021-11-20 thomas uint8_t fbuf[65536];
480 24f136e0 2021-11-20 thomas size_t flen;
481 24f136e0 2021-11-20 thomas ssize_t outlen;
483 24f136e0 2021-11-20 thomas *outsize = 0;
485 24f136e0 2021-11-20 thomas if (fseek(f, 0L, SEEK_SET) == -1)
486 24f136e0 2021-11-20 thomas return got_ferror(f, GOT_ERR_IO);
488 24f136e0 2021-11-20 thomas for (;;) {
489 24f136e0 2021-11-20 thomas flen = fread(fbuf, 1, sizeof(fbuf), f);
490 24f136e0 2021-11-20 thomas if (flen == 0) {
491 24f136e0 2021-11-20 thomas if (ferror(f))
492 24f136e0 2021-11-20 thomas return got_error_from_errno("fread");
493 24f136e0 2021-11-20 thomas if (feof(f))
496 24f136e0 2021-11-20 thomas outlen = write(outfd, fbuf, flen);
497 24f136e0 2021-11-20 thomas if (outlen == -1)
498 24f136e0 2021-11-20 thomas return got_error_from_errno("write");
499 24f136e0 2021-11-20 thomas if (outlen != flen)
500 24f136e0 2021-11-20 thomas return got_error(GOT_ERR_IO);
501 24f136e0 2021-11-20 thomas *outsize += outlen;
504 24f136e0 2021-11-20 thomas return NULL;
507 24f136e0 2021-11-20 thomas static const struct got_error *
508 24f136e0 2021-11-20 thomas merge_binary_file(int *overlapcnt, int merged_fd,
509 24f136e0 2021-11-20 thomas FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
510 24f136e0 2021-11-20 thomas const char *label_deriv, const char *label_orig, const char *label_deriv2,
511 24f136e0 2021-11-20 thomas const char *ondisk_path)
513 24f136e0 2021-11-20 thomas const struct got_error *err = NULL;
514 24f136e0 2021-11-20 thomas int same_content, changed_deriv, changed_deriv2;
515 24f136e0 2021-11-20 thomas int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
516 24f136e0 2021-11-20 thomas off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
517 24f136e0 2021-11-20 thomas char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
518 24f136e0 2021-11-20 thomas char *base_path_orig = NULL, *base_path_deriv = NULL;
519 24f136e0 2021-11-20 thomas char *base_path_deriv2 = NULL;
521 24f136e0 2021-11-20 thomas *overlapcnt = 0;
523 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_deriv2);
525 24f136e0 2021-11-20 thomas return err;
527 24f136e0 2021-11-20 thomas if (same_content)
528 24f136e0 2021-11-20 thomas return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
530 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_orig);
532 24f136e0 2021-11-20 thomas return err;
533 24f136e0 2021-11-20 thomas changed_deriv = !same_content;
534 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv2, f_orig);
536 24f136e0 2021-11-20 thomas return err;
537 24f136e0 2021-11-20 thomas changed_deriv2 = !same_content;
539 24f136e0 2021-11-20 thomas if (changed_deriv && changed_deriv2) {
540 24f136e0 2021-11-20 thomas *overlapcnt = 1;
541 24f136e0 2021-11-20 thomas if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
542 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
543 24f136e0 2021-11-20 thomas goto done;
545 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
546 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
547 24f136e0 2021-11-20 thomas goto done;
549 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
550 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
551 24f136e0 2021-11-20 thomas goto done;
553 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_orig, &fd_orig,
554 24f136e0 2021-11-20 thomas base_path_orig);
556 24f136e0 2021-11-20 thomas goto done;
557 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
558 24f136e0 2021-11-20 thomas base_path_deriv);
560 24f136e0 2021-11-20 thomas goto done;
561 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
562 24f136e0 2021-11-20 thomas base_path_deriv2);
564 24f136e0 2021-11-20 thomas goto done;
565 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
567 24f136e0 2021-11-20 thomas goto done;
568 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
570 24f136e0 2021-11-20 thomas goto done;
571 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
573 24f136e0 2021-11-20 thomas goto done;
574 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "Binary files differ and cannot be "
575 24f136e0 2021-11-20 thomas "merged automatically:\n") < 0) {
576 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
577 24f136e0 2021-11-20 thomas goto done;
579 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
580 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_BEGIN,
581 24f136e0 2021-11-20 thomas label_deriv ? " " : "",
582 24f136e0 2021-11-20 thomas label_deriv ? label_deriv : "",
583 24f136e0 2021-11-20 thomas path_deriv) < 0) {
584 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
585 24f136e0 2021-11-20 thomas goto done;
587 24f136e0 2021-11-20 thomas if (size_orig > 0) {
588 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
589 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_ORIG,
590 24f136e0 2021-11-20 thomas label_orig ? " " : "",
591 24f136e0 2021-11-20 thomas label_orig ? label_orig : "",
592 24f136e0 2021-11-20 thomas path_orig) < 0) {
593 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
594 24f136e0 2021-11-20 thomas goto done;
597 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
598 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_SEP,
599 24f136e0 2021-11-20 thomas path_deriv2,
600 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_END,
601 24f136e0 2021-11-20 thomas label_deriv2 ? " " : "",
602 24f136e0 2021-11-20 thomas label_deriv2 ? label_deriv2 : "") < 0) {
603 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
604 24f136e0 2021-11-20 thomas goto done;
606 24f136e0 2021-11-20 thomas } else if (changed_deriv)
607 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
608 24f136e0 2021-11-20 thomas else if (changed_deriv2)
609 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
611 24f136e0 2021-11-20 thomas if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
612 24f136e0 2021-11-20 thomas err == NULL)
613 24f136e0 2021-11-20 thomas err = got_error_from_errno2("unlink", path_orig);
614 24f136e0 2021-11-20 thomas if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
615 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_orig);
616 24f136e0 2021-11-20 thomas if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
617 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv);
618 24f136e0 2021-11-20 thomas if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
619 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv2);
620 24f136e0 2021-11-20 thomas free(path_orig);
621 24f136e0 2021-11-20 thomas free(path_deriv);
622 24f136e0 2021-11-20 thomas free(path_deriv2);
623 24f136e0 2021-11-20 thomas free(base_path_orig);
624 24f136e0 2021-11-20 thomas free(base_path_deriv);
625 24f136e0 2021-11-20 thomas free(base_path_deriv2);
626 24f136e0 2021-11-20 thomas return err;
630 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
631 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
632 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
633 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
634 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
636 6353ad76 2019-02-08 stsp static const struct got_error *
637 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
638 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
639 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
640 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
641 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
642 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
644 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
645 6353ad76 2019-02-08 stsp int merged_fd = -1;
646 db590691 2021-06-02 stsp FILE *f_merged = NULL;
647 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
648 234035bc 2019-06-01 stsp int overlapcnt = 0;
649 3524bbf9 2020-10-20 stsp char *parent = NULL;
651 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
653 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
655 3524bbf9 2020-10-20 stsp return err;
657 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
658 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
662 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
666 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
667 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
668 24f136e0 2021-11-20 thomas if (err) {
669 24f136e0 2021-11-20 thomas if (err->code != GOT_ERR_FILE_BINARY)
670 24f136e0 2021-11-20 thomas goto done;
671 24f136e0 2021-11-20 thomas err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
672 24f136e0 2021-11-20 thomas f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
673 24f136e0 2021-11-20 thomas ondisk_path);
675 24f136e0 2021-11-20 thomas goto done;
678 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
679 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
683 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
684 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
688 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
689 db590691 2021-06-02 stsp if (f_merged == NULL) {
690 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
693 db590691 2021-06-02 stsp merged_fd = -1;
695 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
696 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
697 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
703 db590691 2021-06-02 stsp if (fchmod(fileno(f_merged), st_mode) != 0) {
704 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
708 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
709 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
710 230a42bd 2019-05-11 jcs ondisk_path);
715 fdcb7daf 2019-12-15 stsp if (merged_path)
716 fdcb7daf 2019-12-15 stsp unlink(merged_path);
718 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
719 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
720 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
721 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
722 6353ad76 2019-02-08 stsp free(merged_path);
723 af54ae4a 2019-02-19 stsp free(base_path);
724 3524bbf9 2020-10-20 stsp free(parent);
725 af57b12a 2020-07-23 stsp return err;
728 af57b12a 2020-07-23 stsp static const struct got_error *
729 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
730 af57b12a 2020-07-23 stsp size_t target_len)
732 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
733 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
734 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
735 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
736 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
737 af57b12a 2020-07-23 stsp ondisk_path);
738 af57b12a 2020-07-23 stsp return NULL;
742 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
743 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
744 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
745 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
747 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
748 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
750 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
751 993e2a1b 2020-07-23 stsp * has deleted this symlink.
753 11cc08c1 2020-07-23 stsp static const struct got_error *
754 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
755 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
756 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
758 11cc08c1 2020-07-23 stsp const struct got_error *err;
759 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
760 11cc08c1 2020-07-23 stsp FILE *f = NULL;
762 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
764 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
766 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
767 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
768 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
772 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
774 3818e3c4 2020-11-01 naddy goto done;
776 3818e3c4 2020-11-01 naddy if (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
777 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
781 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
782 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
783 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
784 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
785 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
786 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
787 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
788 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
789 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
790 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
794 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
795 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
798 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
799 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
803 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
804 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
805 11cc08c1 2020-07-23 stsp free(path);
806 11cc08c1 2020-07-23 stsp free(id_str);
807 11cc08c1 2020-07-23 stsp free(label_deriv);
808 11cc08c1 2020-07-23 stsp return err;
811 d219f183 2020-07-23 stsp /* forward declaration */
812 d219f183 2020-07-23 stsp static const struct got_error *
813 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
814 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
815 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
816 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
819 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
820 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
821 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
822 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
824 af57b12a 2020-07-23 stsp static const struct got_error *
825 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
826 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
827 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
828 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
829 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
831 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
832 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
833 af57b12a 2020-07-23 stsp struct stat sb;
834 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
835 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
836 11cc08c1 2020-07-23 stsp int have_local_change = 0;
837 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
839 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
840 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
842 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
843 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
844 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
845 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
846 af57b12a 2020-07-23 stsp ondisk_path);
849 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
851 526a746f 2020-07-23 stsp if (blob_orig) {
852 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
857 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
858 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
859 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
860 11cc08c1 2020-07-23 stsp have_local_change = 1;
862 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
863 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
864 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
865 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
866 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
868 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
869 11cc08c1 2020-07-23 stsp if (ancestor_target) {
870 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
871 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
873 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
874 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
875 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
876 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
879 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
880 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
881 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
882 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
885 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
888 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
889 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
890 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
891 af57b12a 2020-07-23 stsp strlen(deriv_target));
894 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
895 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
896 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
897 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
898 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
899 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
902 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
903 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
904 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
907 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
913 af57b12a 2020-07-23 stsp free(ancestor_target);
914 eec2f5a9 2021-06-03 stsp return err;
917 eec2f5a9 2021-06-03 stsp static const struct got_error *
918 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
920 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
921 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
922 eec2f5a9 2021-06-03 stsp ssize_t target_len;
926 eec2f5a9 2021-06-03 stsp *outfile = NULL;
928 eec2f5a9 2021-06-03 stsp f = got_opentemp();
929 eec2f5a9 2021-06-03 stsp if (f == NULL)
930 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
931 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
932 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
933 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
936 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
937 eec2f5a9 2021-06-03 stsp if (n != target_len) {
938 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
941 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
942 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
945 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
946 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
953 eec2f5a9 2021-06-03 stsp *outfile = f;
954 14c901f1 2019-08-08 stsp return err;
958 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
959 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
960 14c901f1 2019-08-08 stsp * acts as the second derived version.
962 14c901f1 2019-08-08 stsp static const struct got_error *
963 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
964 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
965 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
966 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
967 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
968 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
970 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
971 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
972 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
973 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
974 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
976 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
978 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
980 ed6b5030 2020-10-20 stsp return err;
982 67a66647 2021-05-31 stsp if (blob_orig) {
983 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
984 67a66647 2021-05-31 stsp parent) == -1) {
985 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
986 67a66647 2021-05-31 stsp base_path = NULL;
990 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
993 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
994 67a66647 2021-05-31 stsp blob_orig);
997 67a66647 2021-05-31 stsp free(base_path);
1000 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1001 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1002 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1004 db590691 2021-06-02 stsp f_orig = got_opentemp();
1005 db590691 2021-06-02 stsp if (f_orig == NULL) {
1006 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1007 db590691 2021-06-02 stsp goto done;
1011 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1012 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1013 14c901f1 2019-08-08 stsp base_path = NULL;
1014 14c901f1 2019-08-08 stsp goto done;
1017 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1019 14c901f1 2019-08-08 stsp goto done;
1020 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1021 14c901f1 2019-08-08 stsp blob_deriv);
1023 14c901f1 2019-08-08 stsp goto done;
1025 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1027 14c901f1 2019-08-08 stsp goto done;
1028 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1029 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1030 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1031 14c901f1 2019-08-08 stsp goto done;
1035 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1036 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1038 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1039 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1041 eec2f5a9 2021-06-03 stsp goto done;
1044 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1045 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1046 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1047 eec2f5a9 2021-06-03 stsp goto done;
1049 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1050 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1051 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1052 eec2f5a9 2021-06-03 stsp close(fd);
1053 eec2f5a9 2021-06-03 stsp goto done;
1057 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1058 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1059 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1061 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1062 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1063 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1064 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1065 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1066 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1067 14c901f1 2019-08-08 stsp free(base_path);
1068 67a66647 2021-05-31 stsp if (blob_orig_path) {
1069 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1070 67a66647 2021-05-31 stsp free(blob_orig_path);
1072 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1073 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1074 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1076 6353ad76 2019-02-08 stsp free(id_str);
1077 818c7501 2019-07-11 stsp free(label_deriv);
1078 ed6b5030 2020-10-20 stsp free(parent);
1079 4a1ddfc2 2019-01-12 stsp return err;
1082 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1083 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1084 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1085 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1087 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1088 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1090 65b05cec 2020-07-23 stsp *new_iep = NULL;
1092 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1094 054041d0 2020-06-24 stsp return err;
1096 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1097 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1099 054041d0 2020-06-24 stsp goto done;
1101 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1104 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1106 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1107 13d9040b 2019-03-27 stsp return err;
1110 1ebedb77 2019-10-19 stsp static mode_t
1111 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1113 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1115 1ebedb77 2019-10-19 stsp if (executable) {
1116 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1117 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1118 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1119 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1120 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1121 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1124 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1127 8ba819a3 2020-07-23 stsp /* forward declaration */
1128 13d9040b 2019-03-27 stsp static const struct got_error *
1129 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1130 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1131 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1132 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1133 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1134 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1137 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1138 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1140 8ba819a3 2020-07-23 stsp static const struct got_error *
1141 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1142 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1144 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1145 5a1fbc73 2020-07-23 stsp ssize_t elen;
1146 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1149 c6e8a826 2021-04-05 stsp *did_something = 0;
1152 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1153 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1154 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1155 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1156 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1157 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1159 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1160 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1161 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink())
1162 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1164 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1165 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1166 5a1fbc73 2020-07-23 stsp if (elen == -1)
1167 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1169 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1170 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1171 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1174 c6e8a826 2021-04-05 stsp *did_something = 1;
1175 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1176 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1177 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1178 5a1fbc73 2020-07-23 stsp return err;
1181 3c1ec782 2020-07-23 stsp static const struct got_error *
1182 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1183 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1185 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1186 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1187 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1189 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1191 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1192 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1193 3c1ec782 2020-07-23 stsp return NULL;
1197 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1198 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1199 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1200 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1201 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1203 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1204 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1205 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1207 ce031e9e 2020-10-20 stsp return err;
1208 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1209 ce031e9e 2020-10-20 stsp free(parent);
1210 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1212 ce031e9e 2020-10-20 stsp free(parent);
1213 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1214 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1215 3c1ec782 2020-07-23 stsp free(abspath);
1216 3c1ec782 2020-07-23 stsp return err;
1218 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1219 3c1ec782 2020-07-23 stsp free(abspath);
1221 3c1ec782 2020-07-23 stsp return err;
1223 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1225 3c1ec782 2020-07-23 stsp return err;
1228 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1229 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1230 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1231 3c1ec782 2020-07-23 stsp return NULL;
1234 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1235 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1236 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1237 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1238 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1239 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1241 3c1ec782 2020-07-23 stsp free(path_got);
1242 3c1ec782 2020-07-23 stsp return NULL;
1245 5a1fbc73 2020-07-23 stsp static const struct got_error *
1246 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1247 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1248 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1249 ace90326 2021-09-27 thomas int path_is_unversioned, int allow_bad_symlinks,
1250 ace90326 2021-09-27 thomas struct got_repository *repo,
1251 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1253 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1254 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1255 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1256 906c123b 2020-07-23 stsp char *path_got = NULL;
1257 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1258 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1260 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1263 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1264 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1265 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1266 8ba819a3 2020-07-23 stsp * in the blob object.
1269 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1270 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1271 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1272 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1273 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1274 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1275 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1276 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1277 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1278 3b9f0f87 2020-07-23 stsp progress_arg);
1280 8ba819a3 2020-07-23 stsp if (len > 0) {
1281 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1282 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1283 8ba819a3 2020-07-23 stsp len - hdrlen);
1284 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1285 8ba819a3 2020-07-23 stsp hdrlen = 0;
1287 8ba819a3 2020-07-23 stsp } while (len != 0);
1288 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1290 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1291 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1293 3c1ec782 2020-07-23 stsp return err;
1295 ace90326 2021-09-27 thomas if (*is_bad_symlink && !allow_bad_symlinks) {
1296 906c123b 2020-07-23 stsp /* install as a regular file */
1297 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1298 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1299 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1300 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1301 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1302 906c123b 2020-07-23 stsp goto done;
1305 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1306 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1307 c6e8a826 2021-04-05 stsp int symlink_replaced;
1308 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1309 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1310 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1311 c90c8ce3 2020-07-23 stsp goto done;
1313 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1314 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1316 f35fa46a 2020-07-23 stsp goto done;
1317 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1318 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1319 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1320 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1321 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1322 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1324 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1325 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1328 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1331 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1332 f4994adc 2020-10-20 stsp char *parent;
1333 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1335 f4994adc 2020-10-20 stsp goto done;
1336 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1337 f4994adc 2020-10-20 stsp free(parent);
1339 f35fa46a 2020-07-23 stsp goto done;
1341 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1342 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1344 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1345 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1346 f35fa46a 2020-07-23 stsp goto done;
1350 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1351 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1352 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1353 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1354 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1355 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1356 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1357 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1358 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1359 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1360 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1361 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1362 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1364 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1365 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1367 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1368 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1369 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1371 906c123b 2020-07-23 stsp free(path_got);
1372 8ba819a3 2020-07-23 stsp return err;
1375 8ba819a3 2020-07-23 stsp static const struct got_error *
1376 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1377 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1378 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1379 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1380 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1381 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1383 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1384 507dc3bb 2018-12-29 stsp int fd = -1;
1385 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1386 507dc3bb 2018-12-29 stsp int update = 0;
1387 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1389 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1390 06340621 2021-12-31 thomas O_CLOEXEC, GOT_DEFAULT_FILE_MODE);
1391 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1392 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1393 f5375317 2020-10-20 stsp char *parent;
1394 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1396 f5375317 2020-10-20 stsp return err;
1397 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1398 f5375317 2020-10-20 stsp free(parent);
1400 21908da4 2019-01-13 stsp return err;
1401 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1402 06340621 2021-12-31 thomas O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1403 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1404 21908da4 2019-01-13 stsp if (fd == -1)
1405 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1406 230a42bd 2019-05-11 jcs ondisk_path);
1407 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1408 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1409 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1410 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1411 3b9f0f87 2020-07-23 stsp goto done;
1413 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1414 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1415 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1416 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1417 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1418 507dc3bb 2018-12-29 stsp goto done;
1420 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1421 507dc3bb 2018-12-29 stsp ondisk_path);
1423 507dc3bb 2018-12-29 stsp goto done;
1424 507dc3bb 2018-12-29 stsp update = 1;
1427 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1430 3818e3c4 2020-11-01 naddy if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1431 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod",
1432 3818e3c4 2020-11-01 naddy update ? tmppath : ondisk_path);
1433 3818e3c4 2020-11-01 naddy goto done;
1436 bd6aa359 2020-07-23 stsp if (progress_cb) {
1437 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1438 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1440 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1441 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1444 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1445 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1447 bd6aa359 2020-07-23 stsp goto done;
1450 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1452 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1453 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1456 9d31a1d8 2018-03-11 stsp if (len > 0) {
1457 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1458 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1459 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1460 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1461 b87c6f83 2018-12-24 stsp goto done;
1462 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1463 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1464 b87c6f83 2018-12-24 stsp goto done;
1466 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1468 9d31a1d8 2018-03-11 stsp } while (len != 0);
1470 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1471 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1472 816dc654 2019-02-16 stsp goto done;
1475 507dc3bb 2018-12-29 stsp if (update) {
1476 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1477 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1478 f6d8c0ac 2020-11-09 stsp goto done;
1480 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1481 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1482 230a42bd 2019-05-11 jcs ondisk_path);
1483 68ed9ba5 2019-02-10 stsp goto done;
1485 63df146d 2020-11-09 stsp free(tmppath);
1486 63df146d 2020-11-09 stsp tmppath = NULL;
1490 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1491 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1492 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1493 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1494 507dc3bb 2018-12-29 stsp free(tmppath);
1495 6353ad76 2019-02-08 stsp return err;
1498 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1499 6353ad76 2019-02-08 stsp static const struct got_error *
1500 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1502 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1503 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1504 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1505 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1506 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1508 7154f6ce 2019-03-27 stsp int i = 0;
1509 9bdd68dd 2020-01-02 naddy char *line = NULL;
1510 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1511 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1513 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1514 9bdd68dd 2020-01-02 naddy linelen = getline(&line, &linesize, f);
1515 9bdd68dd 2020-01-02 naddy if (linelen == -1) {
1516 7154f6ce 2019-03-27 stsp if (feof(f))
1518 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1522 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1523 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1525 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1530 9bdd68dd 2020-01-02 naddy free(line);
1532 7154f6ce 2019-03-27 stsp return err;
1535 e2b1e152 2019-07-13 stsp static int
1536 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1538 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1539 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1542 1ebedb77 2019-10-19 stsp static int
1543 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1545 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1546 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1547 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1548 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1549 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1550 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1553 c363b2c1 2019-08-03 stsp static unsigned char
1554 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1556 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1557 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1558 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1559 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1560 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1561 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1562 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1564 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1568 a919d5c4 2020-07-23 stsp static const struct got_error *
1569 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1570 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1571 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1573 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1574 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1575 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1576 a919d5c4 2020-07-23 stsp ssize_t elen;
1577 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1578 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1579 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1581 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1583 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1585 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1587 a919d5c4 2020-07-23 stsp return err;
1588 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1590 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1591 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1593 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1595 a919d5c4 2020-07-23 stsp if (len > 0) {
1596 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1597 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1598 a919d5c4 2020-07-23 stsp len - hdrlen);
1599 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1600 a919d5c4 2020-07-23 stsp hdrlen = 0;
1602 a919d5c4 2020-07-23 stsp } while (len != 0);
1603 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1605 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1606 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1607 a919d5c4 2020-07-23 stsp if (elen == -1)
1608 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1610 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1611 a919d5c4 2020-07-23 stsp if (elen == -1)
1612 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1615 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1616 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1618 a919d5c4 2020-07-23 stsp return NULL;
1621 7154f6ce 2019-03-27 stsp static const struct got_error *
1622 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1623 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1624 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1626 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1627 6353ad76 2019-02-08 stsp struct got_object_id id;
1628 6353ad76 2019-02-08 stsp size_t hdrlen;
1629 1338848f 2019-12-13 stsp int fd = -1;
1630 6353ad76 2019-02-08 stsp FILE *f = NULL;
1631 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1632 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1633 6353ad76 2019-02-08 stsp size_t flen, blen;
1634 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1636 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1637 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1640 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1641 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1642 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1644 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1645 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1646 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1647 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1648 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1650 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1651 882ef1b9 2019-12-13 stsp goto done;
1653 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1654 3d35a492 2019-12-13 stsp goto done;
1657 06340621 2021-12-31 thomas fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1658 3dc1dc04 2021-09-27 thomas if (fd == -1 && errno != ENOENT &&
1659 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
1660 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1661 3dc1dc04 2021-09-27 thomas else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1662 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1663 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1664 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1665 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1666 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1667 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1669 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1670 3d35a492 2019-12-13 stsp goto done;
1672 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1673 1338848f 2019-12-13 stsp goto done;
1677 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1678 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1679 1338848f 2019-12-13 stsp goto done;
1682 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1683 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1684 1338848f 2019-12-13 stsp goto done;
1685 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1686 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1687 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1688 1338848f 2019-12-13 stsp goto done;
1691 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1692 f179e66d 2020-07-23 stsp goto done;
1694 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1695 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1696 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1697 1338848f 2019-12-13 stsp goto done;
1700 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1701 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1702 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1704 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1706 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1708 1338848f 2019-12-13 stsp goto done;
1710 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1711 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1712 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1713 a919d5c4 2020-07-23 stsp goto done;
1716 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1717 fc63f50d 2021-12-31 thomas fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1718 ab0d4361 2019-12-13 stsp if (fd == -1) {
1719 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1720 ab0d4361 2019-12-13 stsp goto done;
1724 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1725 6353ad76 2019-02-08 stsp if (f == NULL) {
1726 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1727 6353ad76 2019-02-08 stsp goto done;
1730 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1732 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1733 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1735 7154f6ce 2019-03-27 stsp goto done;
1736 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1737 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1738 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1739 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1740 7154f6ce 2019-03-27 stsp goto done;
1742 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1743 6353ad76 2019-02-08 stsp if (flen != 0)
1744 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1746 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1747 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1748 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1750 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1751 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1752 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1753 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1757 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1760 6353ad76 2019-02-08 stsp hdrlen = 0;
1763 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1764 7154f6ce 2019-03-27 stsp rewind(f);
1765 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1766 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1767 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1770 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1771 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1772 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1773 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1774 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1775 9d31a1d8 2018-03-11 stsp return err;
1779 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1780 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1782 e2b1e152 2019-07-13 stsp static const struct got_error *
1783 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1784 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1786 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1787 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1788 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1790 e2b1e152 2019-07-13 stsp return NULL;
1793 9d31a1d8 2018-03-11 stsp static const struct got_error *
1794 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1795 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1796 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1797 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1798 0584f854 2019-04-06 stsp void *progress_arg)
1800 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1801 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1802 6353ad76 2019-02-08 stsp char *ondisk_path;
1803 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1804 b8f41171 2019-02-10 stsp struct stat sb;
1806 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1807 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1810 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1811 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1812 a76c42e6 2019-08-03 stsp goto done;
1814 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1817 abb4604f 2019-07-27 stsp goto done;
1818 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1819 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1821 e6f4ba31 2021-09-24 thomas if (stat(ondisk_path, &sb) == -1) {
1822 e6f4ba31 2021-09-24 thomas if (errno != ENOENT) {
1823 e6f4ba31 2021-09-24 thomas err = got_error_from_errno2("stat",
1824 e6f4ba31 2021-09-24 thomas ondisk_path);
1825 e6f4ba31 2021-09-24 thomas goto done;
1827 e6f4ba31 2021-09-24 thomas sb.st_mode = GOT_DEFAULT_FILE_MODE;
1828 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1829 e6f4ba31 2021-09-24 thomas } else {
1830 e6f4ba31 2021-09-24 thomas if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1831 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1833 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_OBSTRUCTED;
1837 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1839 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1840 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1841 b8f41171 2019-02-10 stsp goto done;
1843 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1845 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1846 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1848 5036ab18 2020-04-18 stsp goto done;
1851 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1852 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1853 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1855 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1856 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1857 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1858 c6e8a826 2021-04-05 stsp * updating contents of this file.
1860 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1861 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1862 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1863 c6e8a826 2021-04-05 stsp /* Same commit. */
1864 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1865 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1867 e2b1e152 2019-07-13 stsp goto done;
1868 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1870 6353ad76 2019-02-08 stsp goto done;
1872 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1873 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1874 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1875 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1876 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1877 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1879 0f58026f 2021-04-05 stsp goto done;
1880 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1882 b8f41171 2019-02-10 stsp goto done;
1886 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1888 6353ad76 2019-02-08 stsp goto done;
1890 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1891 234035bc 2019-06-01 stsp int update_timestamps;
1892 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1893 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1894 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1895 234035bc 2019-06-01 stsp struct got_object_id id2;
1896 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1897 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1899 f69721c3 2019-10-21 stsp goto done;
1901 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1902 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1903 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1904 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1905 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1906 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1907 f69721c3 2019-10-21 stsp goto done;
1909 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1910 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1911 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1912 234035bc 2019-06-01 stsp goto done;
1915 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1916 36bf999c 2020-07-23 stsp char *link_target;
1917 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1919 36bf999c 2020-07-23 stsp goto done;
1920 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1921 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1922 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1923 36bf999c 2020-07-23 stsp free(link_target);
1925 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1926 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1927 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1928 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1930 f69721c3 2019-10-21 stsp free(label_orig);
1931 234035bc 2019-06-01 stsp if (blob2)
1932 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1934 909d120e 2019-09-22 stsp goto done;
1936 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1937 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1938 234035bc 2019-06-01 stsp * unmodified files again.
1940 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1941 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1942 234035bc 2019-06-01 stsp update_timestamps);
1943 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1944 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1945 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1946 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1947 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1949 1ee397ad 2019-07-12 stsp goto done;
1950 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1951 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1953 13d9040b 2019-03-27 stsp goto done;
1955 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1956 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1957 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1958 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1959 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1960 ace90326 2021-09-27 thomas status == GOT_STATUS_UNVERSIONED, 0,
1961 ace90326 2021-09-27 thomas repo, progress_cb, progress_arg);
1963 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1964 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
1965 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
1966 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1967 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1970 13d9040b 2019-03-27 stsp goto done;
1973 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
1974 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
1975 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
1977 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
1978 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
1979 054041d0 2020-06-24 stsp &blob->id);
1982 13d9040b 2019-03-27 stsp goto done;
1984 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
1985 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
1986 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
1989 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1991 6353ad76 2019-02-08 stsp free(ondisk_path);
1992 8da9e5f4 2019-01-12 stsp return err;
1995 90285c3b 2019-01-08 stsp static const struct got_error *
1996 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1998 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1999 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2001 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2002 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2004 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2005 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2006 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2008 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2009 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2011 1c4cdd89 2021-06-20 stsp goto done;
2012 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2013 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2014 fddefe3b 2020-10-20 stsp free(ondisk_path);
2015 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2016 1c4cdd89 2021-06-20 stsp parent = NULL;
2017 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2018 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2019 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2020 fddefe3b 2020-10-20 stsp ondisk_path);
2023 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2029 90285c3b 2019-01-08 stsp free(ondisk_path);
2030 1c4cdd89 2021-06-20 stsp free(parent);
2031 90285c3b 2019-01-08 stsp return err;
2034 708d8e67 2019-03-27 stsp static const struct got_error *
2035 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2036 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2037 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2039 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2040 708d8e67 2019-03-27 stsp unsigned char status;
2041 708d8e67 2019-03-27 stsp struct stat sb;
2042 708d8e67 2019-03-27 stsp char *ondisk_path;
2044 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2045 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2047 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2049 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2051 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2053 5a58a424 2020-06-23 stsp goto done;
2055 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2056 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2057 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2058 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2059 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2060 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2061 993e2a1b 2020-07-23 stsp goto done;
2063 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2064 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2065 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2066 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2068 993e2a1b 2020-07-23 stsp goto done;
2069 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2070 993e2a1b 2020-07-23 stsp ie->path);
2071 993e2a1b 2020-07-23 stsp goto done;
2074 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2075 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2076 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2078 5a58a424 2020-06-23 stsp goto done;
2080 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2081 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2083 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2084 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2086 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2088 5a58a424 2020-06-23 stsp goto done;
2089 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2090 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2092 5a58a424 2020-06-23 stsp goto done;
2094 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2097 5a58a424 2020-06-23 stsp free(ondisk_path);
2098 fc6346c4 2019-03-27 stsp return err;
2101 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2102 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2103 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2104 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2105 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2106 8da9e5f4 2019-01-12 stsp void *progress_arg;
2107 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2108 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2111 512f0d0e 2019-01-02 stsp static const struct got_error *
2112 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2113 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2115 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2117 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2118 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2120 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2121 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2124 8da9e5f4 2019-01-12 stsp static const struct got_error *
2125 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2127 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2129 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2130 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2132 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2133 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2136 9d31a1d8 2018-03-11 stsp static const struct got_error *
2137 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2139 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2140 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2141 8da9e5f4 2019-01-12 stsp char *path;
2143 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2144 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2146 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2147 63c5ca5d 2019-08-24 stsp return NULL;
2149 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2150 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2152 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2154 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2155 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2157 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2158 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2160 8da9e5f4 2019-01-12 stsp free(path);
2161 0cd1c46a 2019-03-11 stsp return err;
2164 b2118c49 2020-07-28 stsp const struct got_error *
2165 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2167 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2169 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2170 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2171 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2172 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2175 b2118c49 2020-07-28 stsp return NULL;
2178 818c7501 2019-07-11 stsp static const struct got_error *
2179 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2181 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2182 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2184 517bab73 2019-03-11 stsp *refname = NULL;
2186 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2188 b2118c49 2020-07-28 stsp return err;
2190 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2191 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2192 0647c563 2019-03-11 stsp *refname = NULL;
2194 517bab73 2019-03-11 stsp free(uuidstr);
2195 517bab73 2019-03-11 stsp return err;
2198 818c7501 2019-07-11 stsp const struct got_error *
2199 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2201 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2204 818c7501 2019-07-11 stsp static const struct got_error *
2205 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2207 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2208 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2211 818c7501 2019-07-11 stsp static const struct got_error *
2212 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2214 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2217 818c7501 2019-07-11 stsp static const struct got_error *
2218 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2220 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2221 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2224 818c7501 2019-07-11 stsp static const struct got_error *
2225 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2227 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2228 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2231 0ebf8283 2019-07-24 stsp static const struct got_error *
2232 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2234 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2235 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2238 0ebf8283 2019-07-24 stsp static const struct got_error *
2239 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2241 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2242 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2245 0ebf8283 2019-07-24 stsp static const struct got_error *
2246 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2248 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2249 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2252 0ebf8283 2019-07-24 stsp static const struct got_error *
2253 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2255 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2256 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2259 0ebf8283 2019-07-24 stsp const struct got_error *
2260 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2261 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2263 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2264 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2265 0ebf8283 2019-07-24 stsp *path = NULL;
2266 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2268 0ebf8283 2019-07-24 stsp return NULL;
2271 10604dce 2021-09-24 thomas static const struct got_error *
2272 10604dce 2021-09-24 thomas get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2274 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2275 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2278 10604dce 2021-09-24 thomas static const struct got_error *
2279 10604dce 2021-09-24 thomas get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2281 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2282 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2286 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2287 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2289 517bab73 2019-03-11 stsp static const struct got_error *
2290 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2292 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2293 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2294 517bab73 2019-03-11 stsp char *refname;
2296 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2298 517bab73 2019-03-11 stsp return err;
2300 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2302 0cd1c46a 2019-03-11 stsp goto done;
2304 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2306 0cd1c46a 2019-03-11 stsp free(refname);
2308 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2309 3e3a69f1 2019-07-25 stsp return err;
2312 3e3a69f1 2019-07-25 stsp static const struct got_error *
2313 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2315 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2317 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2318 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2319 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2320 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2322 9d31a1d8 2018-03-11 stsp return err;
2326 ebf99748 2019-05-09 stsp static const struct got_error *
2327 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2328 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2330 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2331 ebf99748 2019-05-09 stsp FILE *index = NULL;
2333 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2334 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2335 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2336 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2338 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2340 ebf99748 2019-05-09 stsp goto done;
2342 c56c5d8a 2021-12-31 thomas index = fopen(*fileindex_path, "rbe");
2343 ebf99748 2019-05-09 stsp if (index == NULL) {
2344 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2345 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2347 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2348 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2349 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2352 ebf99748 2019-05-09 stsp if (err) {
2353 ebf99748 2019-05-09 stsp free(*fileindex_path);
2354 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2355 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2356 ebf99748 2019-05-09 stsp *fileindex = NULL;
2358 ebf99748 2019-05-09 stsp return err;
2361 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2362 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2363 c932eeeb 2019-05-22 stsp const char *path;
2364 c932eeeb 2019-05-22 stsp size_t path_len;
2365 c932eeeb 2019-05-22 stsp const char *entry_name;
2366 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2367 a484d721 2019-06-10 stsp void *progress_arg;
2370 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2371 c932eeeb 2019-05-22 stsp static const struct got_error *
2372 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2374 1ee397ad 2019-07-12 stsp const struct got_error *err;
2375 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2377 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2378 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2379 c932eeeb 2019-05-22 stsp return NULL;
2380 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2381 102ff934 2019-06-11 stsp return NULL;
2383 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2384 a769b60b 2021-06-27 stsp return NULL;
2386 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2387 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2388 c932eeeb 2019-05-22 stsp return NULL;
2390 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2391 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2392 edd02c5e 2019-07-11 stsp ie->path);
2394 1ee397ad 2019-07-12 stsp return err;
2396 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2397 c932eeeb 2019-05-22 stsp return NULL;
2400 a615e0e7 2020-12-16 stsp static const struct got_error *
2401 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2402 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2403 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2405 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2407 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2408 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2409 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2410 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2411 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2412 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2414 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2415 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2418 9c6338c4 2019-06-02 stsp static const struct got_error *
2419 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2421 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2422 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2423 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2424 867630bb 2020-01-17 stsp struct timespec timeout;
2426 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2427 9c6338c4 2019-06-02 stsp fileindex_path);
2429 9c6338c4 2019-06-02 stsp goto done;
2431 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2433 9c6338c4 2019-06-02 stsp goto done;
2435 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2436 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2437 9c6338c4 2019-06-02 stsp fileindex_path);
2438 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2442 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2443 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2444 867630bb 2020-01-17 stsp * was recorded in the file index.
2446 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2447 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2448 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2450 9c6338c4 2019-06-02 stsp if (new_index)
2451 9c6338c4 2019-06-02 stsp fclose(new_index);
2452 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2453 9c6338c4 2019-06-02 stsp return err;
2456 6ced4176 2019-07-12 stsp static const struct got_error *
2457 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2458 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2459 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2461 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2462 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2463 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2464 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2466 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2467 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2468 6ced4176 2019-07-12 stsp *tree_id = NULL;
2470 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2471 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2472 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2473 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2474 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2475 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2476 6ced4176 2019-07-12 stsp goto done;
2478 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2479 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2481 6ced4176 2019-07-12 stsp goto done;
2482 6ced4176 2019-07-12 stsp return NULL;
2485 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2487 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2488 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2489 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2490 6ced4176 2019-07-12 stsp goto done;
2493 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2494 6ced4176 2019-07-12 stsp in_repo_path);
2496 6ced4176 2019-07-12 stsp goto done;
2498 6ced4176 2019-07-12 stsp free(in_repo_path);
2499 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2501 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2503 6ced4176 2019-07-12 stsp goto done;
2505 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2506 6ced4176 2019-07-12 stsp /* Check out a single file. */
2507 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2508 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2509 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2510 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2511 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2512 6ced4176 2019-07-12 stsp goto done;
2514 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2515 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2516 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2517 6ced4176 2019-07-12 stsp goto done;
2520 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2521 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2523 6ced4176 2019-07-12 stsp return err;
2524 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2525 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2526 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2527 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2528 6ced4176 2019-07-12 stsp goto done;
2531 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2532 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2534 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2535 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2536 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2537 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2538 6ced4176 2019-07-12 stsp goto done;
2540 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2541 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2542 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2543 6ced4176 2019-07-12 stsp goto done;
2548 6ced4176 2019-07-12 stsp free(in_repo_path);
2549 6ced4176 2019-07-12 stsp if (err) {
2550 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2551 6ced4176 2019-07-12 stsp free(*tree_relpath);
2552 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2553 6ced4176 2019-07-12 stsp free(*tree_id);
2554 6ced4176 2019-07-12 stsp *tree_id = NULL;
2556 07ed472d 2019-07-12 stsp return err;
2559 07ed472d 2019-07-12 stsp static const struct got_error *
2560 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2561 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2562 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2563 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2565 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2566 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2567 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2568 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2569 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2571 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2572 7f47418f 2019-12-20 stsp if (err) {
2573 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2574 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2575 7f47418f 2019-12-20 stsp goto done;
2576 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2577 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2579 7f47418f 2019-12-20 stsp return err;
2582 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2583 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2585 07ed472d 2019-07-12 stsp goto done;
2587 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2589 07ed472d 2019-07-12 stsp goto done;
2591 07ed472d 2019-07-12 stsp if (entry_name &&
2592 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2593 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2594 07ed472d 2019-07-12 stsp goto done;
2597 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2598 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2599 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2600 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2601 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2602 07ed472d 2019-07-12 stsp arg.repo = repo;
2603 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2604 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2605 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2606 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2607 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2608 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2611 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2612 07ed472d 2019-07-12 stsp if (commit)
2613 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2614 6ced4176 2019-07-12 stsp return err;
2617 9d31a1d8 2018-03-11 stsp const struct got_error *
2618 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2619 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2620 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2621 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2623 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2624 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2625 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2626 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2627 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2628 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2629 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2630 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2631 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2632 f2ea84fa 2019-07-27 stsp int entry_type;
2633 f2ea84fa 2019-07-27 stsp char *relpath;
2634 f2ea84fa 2019-07-27 stsp char *entry_name;
2635 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2636 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2638 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2640 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2642 9d31a1d8 2018-03-11 stsp return err;
2644 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2645 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2646 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2647 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2648 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2649 f2ea84fa 2019-07-27 stsp goto done;
2652 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2653 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2654 f2ea84fa 2019-07-27 stsp if (err) {
2655 f2ea84fa 2019-07-27 stsp free(tpd);
2656 6ced4176 2019-07-12 stsp goto done;
2659 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2660 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2661 f2ea84fa 2019-07-27 stsp if (err) {
2662 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2663 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2664 f2ea84fa 2019-07-27 stsp free(tpd);
2665 f2ea84fa 2019-07-27 stsp goto done;
2668 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2670 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2674 51514078 2018-12-25 stsp * Read the file index.
2675 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2676 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2678 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2680 c4cdcb68 2019-04-03 stsp goto done;
2682 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2683 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2684 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2686 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2687 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2688 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2692 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2693 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2694 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2695 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2696 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2697 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2698 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2699 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2703 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2705 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2706 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2707 af12c6b9 2019-06-04 stsp err = sync_err;
2709 9c6338c4 2019-06-02 stsp free(fileindex_path);
2711 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2712 9d31a1d8 2018-03-11 stsp if (commit)
2713 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2714 5ade8233 2019-07-12 stsp if (fileindex)
2715 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2716 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2717 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2718 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2719 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2720 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2721 f2ea84fa 2019-07-27 stsp free(tpd);
2723 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2724 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2725 9d31a1d8 2018-03-11 stsp err = unlockerr;
2726 f8d1f275 2019-02-04 stsp return err;
2729 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2730 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2731 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2732 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2733 234035bc 2019-06-01 stsp void *progress_arg;
2734 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2735 234035bc 2019-06-01 stsp void *cancel_arg;
2736 f69721c3 2019-10-21 stsp const char *label_orig;
2737 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2738 ace90326 2021-09-27 thomas int allow_bad_symlinks;
2741 234035bc 2019-06-01 stsp static const struct got_error *
2742 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2743 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2744 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2745 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2747 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2748 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2749 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2750 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2751 234035bc 2019-06-01 stsp struct stat sb;
2752 234035bc 2019-06-01 stsp unsigned char status;
2753 234035bc 2019-06-01 stsp int local_changes_subsumed;
2754 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2755 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2757 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2758 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2759 d6c87207 2019-08-02 stsp strlen(path2));
2760 1ee397ad 2019-07-12 stsp if (ie == NULL)
2761 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2762 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2764 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2765 234035bc 2019-06-01 stsp path2) == -1)
2766 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2768 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2771 234035bc 2019-06-01 stsp goto done;
2773 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2774 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2775 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2776 234035bc 2019-06-01 stsp goto done;
2778 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2779 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2780 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2781 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2782 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2783 234035bc 2019-06-01 stsp goto done;
2786 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2787 36bf999c 2020-07-23 stsp char *link_target2;
2788 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2790 36bf999c 2020-07-23 stsp goto done;
2791 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2792 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2793 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2794 36bf999c 2020-07-23 stsp free(link_target2);
2798 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2799 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2800 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2801 1af628f4 2021-06-03 stsp goto done;
2803 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2804 1af628f4 2021-06-03 stsp f_orig, blob1);
2806 1af628f4 2021-06-03 stsp goto done;
2808 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2809 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2810 1af628f4 2021-06-03 stsp goto done;
2811 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2812 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2814 1af628f4 2021-06-03 stsp goto done;
2816 48b4f239 2021-12-31 thomas fd = open(ondisk_path,
2817 48b4f239 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2818 1af628f4 2021-06-03 stsp if (fd == -1) {
2819 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2820 1af628f4 2021-06-03 stsp ondisk_path);
2821 1af628f4 2021-06-03 stsp goto done;
2823 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2824 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2825 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2826 1af628f4 2021-06-03 stsp ondisk_path);
2827 1af628f4 2021-06-03 stsp close(fd);
2828 1af628f4 2021-06-03 stsp goto done;
2830 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2832 1af628f4 2021-06-03 stsp goto done;
2833 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2834 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2835 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2836 1af628f4 2021-06-03 stsp goto done;
2838 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2839 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2840 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2841 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2842 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2844 234035bc 2019-06-01 stsp } else if (blob1) {
2845 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2846 d6c87207 2019-08-02 stsp strlen(path1));
2847 1ee397ad 2019-07-12 stsp if (ie == NULL)
2848 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2849 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2851 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2852 2b92fad7 2019-06-02 stsp path1) == -1)
2853 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2855 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2858 2b92fad7 2019-06-02 stsp goto done;
2860 2b92fad7 2019-06-02 stsp switch (status) {
2861 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2862 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2863 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2865 1ee397ad 2019-07-12 stsp goto done;
2866 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2868 2b92fad7 2019-06-02 stsp goto done;
2870 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2872 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2873 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2874 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2875 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2877 1ee397ad 2019-07-12 stsp goto done;
2879 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2881 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2882 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2883 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2884 e8f02263 2022-01-23 thomas off_t blob1_size;
2886 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2887 0a22ca1a 2020-09-23 stsp * exists in the repository.
2889 e8f02263 2022-01-23 thomas err = got_object_blob_file_create(&id, &blob1_f,
2890 e8f02263 2022-01-23 thomas &blob1_size, path1);
2892 0a22ca1a 2020-09-23 stsp goto done;
2893 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2894 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2895 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2897 0a22ca1a 2020-09-23 stsp goto done;
2898 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2901 0a22ca1a 2020-09-23 stsp goto done;
2903 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2906 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2907 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2909 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2910 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2913 0a22ca1a 2020-09-23 stsp goto done;
2916 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2917 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2918 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2919 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2921 1ee397ad 2019-07-12 stsp goto done;
2923 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2924 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2926 1ee397ad 2019-07-12 stsp goto done;
2931 234035bc 2019-06-01 stsp } else if (blob2) {
2932 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2933 234035bc 2019-06-01 stsp path2) == -1)
2934 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2935 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2936 d6c87207 2019-08-02 stsp strlen(path2));
2938 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2939 7f91a133 2019-12-13 stsp -1, NULL, repo);
2941 234035bc 2019-06-01 stsp goto done;
2942 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2943 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2944 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2945 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2946 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2947 1ee397ad 2019-07-12 stsp status, path2);
2948 234035bc 2019-06-01 stsp goto done;
2950 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2951 36bf999c 2020-07-23 stsp char *link_target2;
2952 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2955 36bf999c 2020-07-23 stsp goto done;
2956 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2957 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2958 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2959 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2960 36bf999c 2020-07-23 stsp free(link_target2);
2961 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2962 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2963 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2964 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2965 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2966 526a746f 2020-07-23 stsp a->progress_arg);
2968 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2969 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2972 dfe9fba0 2020-07-23 stsp goto done;
2973 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2974 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2975 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
2976 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2978 234035bc 2019-06-01 stsp goto done;
2981 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2982 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2983 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2984 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2985 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2986 ace90326 2021-09-27 thomas 0, 1, a->allow_bad_symlinks, repo,
2987 ace90326 2021-09-27 thomas a->progress_cb, a->progress_arg);
2989 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2990 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2991 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2994 234035bc 2019-06-01 stsp goto done;
2995 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2997 234035bc 2019-06-01 stsp goto done;
2998 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2999 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3000 3969253a 2020-03-07 stsp if (err) {
3001 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3002 3969253a 2020-03-07 stsp goto done;
3004 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3005 2b92fad7 2019-06-02 stsp if (err) {
3006 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3007 2b92fad7 2019-06-02 stsp goto done;
3009 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3010 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3011 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3016 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3017 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3018 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3019 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3020 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3021 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3022 1af628f4 2021-06-03 stsp free(id_str);
3023 54d5be07 2021-06-03 stsp free(label_deriv2);
3024 234035bc 2019-06-01 stsp free(ondisk_path);
3025 234035bc 2019-06-01 stsp return err;
3028 69de9dd4 2021-09-03 stsp static const struct got_error *
3029 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3031 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3033 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3034 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3035 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3036 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3037 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3039 69de9dd4 2021-09-03 stsp return NULL;
3042 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3043 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3044 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3045 234035bc 2019-06-01 stsp struct got_repository *repo;
3048 234035bc 2019-06-01 stsp static const struct got_error *
3049 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3050 69de9dd4 2021-09-03 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3051 69de9dd4 2021-09-03 stsp struct got_object_id *id2, const char *path1, const char *path2,
3052 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3054 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3055 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3056 234035bc 2019-06-01 stsp unsigned char status;
3057 234035bc 2019-06-01 stsp struct stat sb;
3058 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3059 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3060 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3061 234035bc 2019-06-01 stsp char *ondisk_path;
3063 69de9dd4 2021-09-03 stsp if (id == NULL)
3064 69de9dd4 2021-09-03 stsp return NULL;
3066 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3067 69de9dd4 2021-09-03 stsp if (ie == NULL)
3068 69de9dd4 2021-09-03 stsp return NULL;
3070 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3072 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3074 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3075 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3076 5546d466 2021-09-02 stsp free(ondisk_path);
3078 234035bc 2019-06-01 stsp return err;
3079 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3080 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3082 234035bc 2019-06-01 stsp return NULL;
3085 818c7501 2019-07-11 stsp static const struct got_error *
3086 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3087 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3088 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3089 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3090 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3092 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3093 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3094 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3095 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3096 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3097 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3099 03415a1a 2019-06-02 stsp if (commit_id1) {
3100 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3101 03415a1a 2019-06-02 stsp worktree->path_prefix);
3102 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3103 03415a1a 2019-06-02 stsp goto done;
3105 69d57f3d 2020-07-31 stsp if (tree_id1) {
3106 69d57f3d 2020-07-31 stsp char *id_str;
3108 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3110 03415a1a 2019-06-02 stsp goto done;
3112 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3114 f69721c3 2019-10-21 stsp goto done;
3116 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3117 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3118 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3119 f69721c3 2019-10-21 stsp free(id_str);
3120 f69721c3 2019-10-21 stsp goto done;
3122 f69721c3 2019-10-21 stsp free(id_str);
3125 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3126 234035bc 2019-06-01 stsp worktree->path_prefix);
3128 234035bc 2019-06-01 stsp goto done;
3130 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3132 234035bc 2019-06-01 stsp goto done;
3134 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3135 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3136 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3137 69de9dd4 2021-09-03 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3138 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3140 69de9dd4 2021-09-03 stsp goto done;
3142 234035bc 2019-06-01 stsp arg.worktree = worktree;
3143 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3144 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3145 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3146 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3147 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3148 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3149 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3150 ace90326 2021-09-27 thomas arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3151 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3152 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3153 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3154 af12c6b9 2019-06-04 stsp err = sync_err;
3156 234035bc 2019-06-01 stsp if (tree1)
3157 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3158 234035bc 2019-06-01 stsp if (tree2)
3159 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3160 f69721c3 2019-10-21 stsp free(label_orig);
3161 818c7501 2019-07-11 stsp return err;
3164 818c7501 2019-07-11 stsp const struct got_error *
3165 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3166 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3167 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3168 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3170 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3171 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3172 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3174 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3176 818c7501 2019-07-11 stsp return err;
3178 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3180 818c7501 2019-07-11 stsp goto done;
3182 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3183 69de9dd4 2021-09-03 stsp worktree);
3185 818c7501 2019-07-11 stsp goto done;
3187 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3188 10604dce 2021-09-24 thomas commit_id2, repo, progress_cb, progress_arg,
3189 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
3191 818c7501 2019-07-11 stsp if (fileindex)
3192 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3193 818c7501 2019-07-11 stsp free(fileindex_path);
3194 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3195 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3196 234035bc 2019-06-01 stsp err = unlockerr;
3197 234035bc 2019-06-01 stsp return err;
3200 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3201 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3202 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3203 927df6b7 2019-02-10 stsp const char *status_path;
3204 927df6b7 2019-02-10 stsp size_t status_path_len;
3205 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3206 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3207 f8d1f275 2019-02-04 stsp void *status_arg;
3208 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3209 f8d1f275 2019-02-04 stsp void *cancel_arg;
3210 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3211 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3212 f2a9dc41 2019-12-13 tracey int report_unchanged;
3213 3143d852 2020-06-25 stsp int no_ignores;
3216 f8d1f275 2019-02-04 stsp static const struct got_error *
3217 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3218 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3219 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3220 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3222 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3223 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3224 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3225 927df6b7 2019-02-10 stsp struct stat sb;
3226 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3227 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3228 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3230 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3232 98eaaa12 2019-08-03 stsp return err;
3234 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3235 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3236 98eaaa12 2019-08-03 stsp return NULL;
3238 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3239 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3240 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3242 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3243 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3244 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3246 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3247 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3248 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3249 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3250 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3253 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3254 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3257 927df6b7 2019-02-10 stsp static const struct got_error *
3258 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3259 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3261 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3262 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3263 f8d1f275 2019-02-04 stsp char *abspath;
3265 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3266 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3268 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3269 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3270 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3271 927df6b7 2019-02-10 stsp return NULL;
3273 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3274 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3275 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3276 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3278 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3279 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3280 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3283 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3284 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3285 f8d1f275 2019-02-04 stsp free(abspath);
3286 9d31a1d8 2018-03-11 stsp return err;
3289 f8d1f275 2019-02-04 stsp static const struct got_error *
3290 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3292 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3293 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3294 2ec1f75b 2019-03-26 stsp unsigned char status;
3296 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3297 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3299 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3300 927df6b7 2019-02-10 stsp return NULL;
3302 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3303 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3304 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3305 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3307 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3308 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3309 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3313 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3315 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3317 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3318 6841da00 2019-08-08 stsp free((char *)pe->path);
3319 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3323 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3325 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3327 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3328 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3329 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3330 6841da00 2019-08-08 stsp free((char *)pe->path);
3332 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3335 6841da00 2019-08-08 stsp static const struct got_error *
3336 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3338 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3339 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3340 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3341 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3342 6841da00 2019-08-08 stsp size_t linesize = 0;
3343 6841da00 2019-08-08 stsp ssize_t linelen;
3345 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3346 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3347 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3348 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3350 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3351 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3352 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3354 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3355 bd8de430 2019-10-04 stsp if (line[0] == '#')
3358 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3359 bd8de430 2019-10-04 stsp if (line[0] == '!')
3362 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3363 6841da00 2019-08-08 stsp line) == -1) {
3364 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3365 6841da00 2019-08-08 stsp goto done;
3367 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3369 6841da00 2019-08-08 stsp goto done;
3371 6841da00 2019-08-08 stsp if (ferror(f)) {
3372 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3373 6841da00 2019-08-08 stsp goto done;
3376 6841da00 2019-08-08 stsp dirpath = strdup(path);
3377 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3378 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3379 6841da00 2019-08-08 stsp goto done;
3381 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3383 6841da00 2019-08-08 stsp free(line);
3384 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3385 6841da00 2019-08-08 stsp free(dirpath);
3386 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3388 6841da00 2019-08-08 stsp return err;
3392 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3394 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3396 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3397 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3398 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3399 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3401 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3402 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3404 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3406 bd8de430 2019-10-04 stsp pattern += 3;
3408 bd8de430 2019-10-04 stsp while (*p) {
3409 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3410 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3411 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3412 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3414 bd8de430 2019-10-04 stsp while (*p == '/')
3424 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3425 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3426 6841da00 2019-08-08 stsp * ignores backwards.
3428 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3429 6841da00 2019-08-08 stsp while (pe) {
3430 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3431 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3432 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3433 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3434 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3435 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3436 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3437 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3438 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3443 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3449 6841da00 2019-08-08 stsp static const struct got_error *
3450 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3451 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3453 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3454 6841da00 2019-08-08 stsp char *ignorespath;
3455 886cec17 2019-12-15 stsp int fd = -1;
3456 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3458 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3459 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3460 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3462 886cec17 2019-12-15 stsp if (dirfd != -1) {
3463 fc63f50d 2021-12-31 thomas fd = openat(dirfd, ignores_filename,
3464 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3465 886cec17 2019-12-15 stsp if (fd == -1) {
3466 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3467 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3468 886cec17 2019-12-15 stsp ignorespath);
3470 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3471 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3472 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3473 886cec17 2019-12-15 stsp ignorespath);
3476 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3480 c56c5d8a 2021-12-31 thomas ignoresfile = fopen(ignorespath, "re");
3481 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3482 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3483 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3484 886cec17 2019-12-15 stsp ignorespath);
3486 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3489 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3490 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3491 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3492 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3493 6841da00 2019-08-08 stsp free(ignorespath);
3494 6841da00 2019-08-08 stsp return err;
3497 f8d1f275 2019-02-04 stsp static const struct got_error *
3498 6092c299 2021-10-04 thomas status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3499 6092c299 2021-10-04 thomas int dirfd)
3501 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3502 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3503 f8d1f275 2019-02-04 stsp char *path = NULL;
3505 6092c299 2021-10-04 thomas if (ignore != NULL)
3506 6092c299 2021-10-04 thomas *ignore = 0;
3508 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3509 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3511 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3512 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3513 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3515 f8d1f275 2019-02-04 stsp path = de->d_name;
3518 6092c299 2021-10-04 thomas if (de->d_type == DT_DIR) {
3519 6092c299 2021-10-04 thomas if (!a->no_ignores && ignore != NULL &&
3520 6092c299 2021-10-04 thomas match_ignores(a->ignores, path))
3521 6092c299 2021-10-04 thomas *ignore = 1;
3522 6092c299 2021-10-04 thomas } else if (!match_ignores(a->ignores, path) &&
3523 6092c299 2021-10-04 thomas got_path_is_child(path, a->status_path, a->status_path_len))
3524 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3525 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3526 f8d1f275 2019-02-04 stsp if (parent_path[0])
3527 f8d1f275 2019-02-04 stsp free(path);
3528 b72f483a 2019-02-05 stsp return err;
3531 347d1d3e 2019-07-12 stsp static const struct got_error *
3532 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3534 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3535 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3537 3143d852 2020-06-25 stsp if (a->no_ignores)
3538 3143d852 2020-06-25 stsp return NULL;
3540 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3541 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3543 3143d852 2020-06-25 stsp return err;
3545 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3546 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3548 3143d852 2020-06-25 stsp return err;
3551 3143d852 2020-06-25 stsp static const struct got_error *
3552 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3553 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3554 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3555 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3557 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3558 abb4604f 2019-07-27 stsp struct stat sb;
3560 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3562 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3563 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3565 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3566 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3567 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3568 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3569 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3572 fe1d8685 2022-02-12 thomas if (!no_ignores && match_ignores(ignores, path))
3573 fe1d8685 2022-02-12 thomas return NULL;
3575 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3576 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3577 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3579 abb4604f 2019-07-27 stsp return NULL;
3582 3143d852 2020-06-25 stsp static const struct got_error *
3583 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3584 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3586 3143d852 2020-06-25 stsp const struct got_error *err;
3587 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3589 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3590 3143d852 2020-06-25 stsp ".cvsignore");
3592 3143d852 2020-06-25 stsp return err;
3594 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3595 3143d852 2020-06-25 stsp ".gitignore");
3597 3143d852 2020-06-25 stsp return err;
3599 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3600 3143d852 2020-06-25 stsp if (err) {
3601 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3602 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3603 3143d852 2020-06-25 stsp return err;
3605 3143d852 2020-06-25 stsp for (;;) {
3606 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3607 3143d852 2020-06-25 stsp ".cvsignore");
3610 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3611 3143d852 2020-06-25 stsp ".gitignore");
3614 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3615 3143d852 2020-06-25 stsp if (err) {
3616 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3617 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3620 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3622 b737c85a 2020-06-26 stsp free(parent_path);
3623 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3624 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3627 b737c85a 2020-06-26 stsp free(parent_path);
3628 b737c85a 2020-06-26 stsp free(next_parent_path);
3629 3143d852 2020-06-25 stsp return err;
3632 abb4604f 2019-07-27 stsp static const struct got_error *
3633 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3634 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3635 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3636 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3637 f2a9dc41 2019-12-13 tracey int report_unchanged)
3639 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3640 6fc93f37 2019-12-13 stsp int fd = -1;
3641 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3642 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3643 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3644 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3645 a78810f8 2022-03-13 thomas struct got_fileindex_entry *ie;
3647 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3649 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3650 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3651 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3653 a78810f8 2022-03-13 thomas ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3654 a78810f8 2022-03-13 thomas if (ie) {
3655 a78810f8 2022-03-13 thomas err = report_single_file_status(path, ondisk_path,
3656 a78810f8 2022-03-13 thomas fileindex, status_cb, status_arg, repo,
3657 a78810f8 2022-03-13 thomas report_unchanged, &ignores, no_ignores);
3658 a78810f8 2022-03-13 thomas goto done;
3661 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3662 6fc93f37 2019-12-13 stsp if (fd == -1) {
3663 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3664 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
3665 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3667 ff56836b 2021-07-08 stsp if (!no_ignores) {
3668 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3669 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3671 ff56836b 2021-07-08 stsp goto done;
3673 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3674 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3675 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3678 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3679 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3680 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3681 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3682 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3683 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3684 abb4604f 2019-07-27 stsp arg.status_path = path;
3685 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3686 abb4604f 2019-07-27 stsp arg.repo = repo;
3687 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3688 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3689 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3690 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3691 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3692 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3693 022fae89 2019-12-06 tracey if (!no_ignores) {
3694 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3695 3143d852 2020-06-25 stsp worktree->root_path, path);
3697 3143d852 2020-06-25 stsp goto done;
3699 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3700 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3701 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3704 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3705 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3706 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3707 927df6b7 2019-02-10 stsp free(ondisk_path);
3708 347d1d3e 2019-07-12 stsp return err;
3711 347d1d3e 2019-07-12 stsp const struct got_error *
3712 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3713 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3714 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3715 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3717 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3718 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3719 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3720 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3722 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3724 347d1d3e 2019-07-12 stsp return err;
3726 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3727 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3728 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3729 f6343036 2021-06-22 stsp no_ignores, 0);
3733 f8d1f275 2019-02-04 stsp free(fileindex_path);
3734 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3735 f8d1f275 2019-02-04 stsp return err;
3738 6c7ab921 2019-03-18 stsp const struct got_error *
3739 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3740 6c7ab921 2019-03-18 stsp const char *arg)
3742 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3743 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3744 6c7ab921 2019-03-18 stsp size_t len;
3745 00bb5ea0 2020-07-23 stsp struct stat sb;
3746 01740607 2020-11-04 stsp char *abspath = NULL;
3747 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3749 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3751 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3752 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3753 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3755 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3756 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3757 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3758 00bb5ea0 2020-07-23 stsp goto done;
3760 727173c3 2020-11-06 stsp sb.st_mode = 0;
3762 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3764 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3765 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3766 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3767 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3769 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3770 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3771 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3772 00bb5ea0 2020-07-23 stsp goto done;
3776 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3777 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3779 d0710d08 2019-07-22 stsp goto done;
3780 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3781 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3782 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3783 00bb5ea0 2020-07-23 stsp goto done;
3786 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3787 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3788 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3789 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3790 00bb5ea0 2020-07-23 stsp goto done;
3792 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3793 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3794 01740607 2020-11-04 stsp goto done;
3796 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3797 01740607 2020-11-04 stsp sizeof(canonpath));
3799 00bb5ea0 2020-07-23 stsp goto done;
3800 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3801 01740607 2020-11-04 stsp if (resolved == NULL) {
3802 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3803 01740607 2020-11-04 stsp goto done;
3808 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3809 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3810 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3811 6c7ab921 2019-03-18 stsp goto done;
3814 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3815 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3816 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3818 f6d88e1a 2019-05-29 stsp goto done;
3820 f6d88e1a 2019-05-29 stsp path = strdup("");
3821 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3822 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3823 f6d88e1a 2019-05-29 stsp goto done;
3827 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3828 6c7ab921 2019-03-18 stsp len = strlen(path);
3829 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3830 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3834 01740607 2020-11-04 stsp free(abspath);
3835 6c7ab921 2019-03-18 stsp free(resolved);
3836 d0710d08 2019-07-22 stsp free(cwd);
3837 6c7ab921 2019-03-18 stsp if (err == NULL)
3838 6c7ab921 2019-03-18 stsp *wt_path = path;
3840 6c7ab921 2019-03-18 stsp free(path);
3841 d00136be 2019-03-26 stsp return err;
3844 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3845 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3846 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3847 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3848 4e68cba3 2019-11-23 stsp void *progress_arg;
3849 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3852 4e68cba3 2019-11-23 stsp static const struct got_error *
3853 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3854 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3855 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3856 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3858 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3859 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3860 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3861 6d022e97 2019-08-04 stsp struct stat sb;
3862 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3864 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3865 dbb83fbd 2019-12-12 stsp relpath) == -1)
3866 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3868 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3870 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3871 12463d8b 2019-12-13 stsp de_name, a->repo);
3873 dbb83fbd 2019-12-12 stsp goto done;
3874 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3875 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3876 dbb83fbd 2019-12-12 stsp goto done;
3877 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3879 dbb83fbd 2019-12-12 stsp goto done;
3882 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3883 84bf00a6 2022-02-12 thomas if (status == GOT_STATUS_NONEXISTENT)
3884 84bf00a6 2022-02-12 thomas err = got_error_set_errno(ENOENT, ondisk_path);
3886 84bf00a6 2022-02-12 thomas err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3887 dbb83fbd 2019-12-12 stsp goto done;
3890 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3892 4e68cba3 2019-11-23 stsp goto done;
3893 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3894 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3895 3969253a 2020-03-07 stsp if (err) {
3896 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3897 3969253a 2020-03-07 stsp goto done;
3899 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3900 07f5b47a 2019-06-02 stsp if (err) {
3901 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3902 4e68cba3 2019-11-23 stsp goto done;
3905 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3907 dbb83fbd 2019-12-12 stsp return err;
3908 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3909 dbb83fbd 2019-12-12 stsp return NULL;
3910 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3913 d00136be 2019-03-26 stsp const struct got_error *
3914 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3915 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3916 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3917 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3919 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3920 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3921 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3922 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3923 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3925 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3927 d00136be 2019-03-26 stsp return err;
3929 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3931 d00136be 2019-03-26 stsp goto done;
3933 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3934 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3935 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3936 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3937 4e68cba3 2019-11-23 stsp saa.repo = repo;
3939 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3940 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3941 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3945 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3946 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3947 af12c6b9 2019-06-04 stsp err = sync_err;
3949 fb399478 2019-07-12 stsp free(fileindex_path);
3950 d00136be 2019-03-26 stsp if (fileindex)
3951 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3952 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3953 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3954 d00136be 2019-03-26 stsp err = unlockerr;
3955 6c7ab921 2019-03-18 stsp return err;
3958 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3959 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3960 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3961 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3962 f2a9dc41 2019-12-13 tracey void *progress_arg;
3963 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3964 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3965 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3966 d64cc78a 2022-01-25 thomas int ignore_missing_paths;
3967 766841c2 2020-08-13 stsp const char *status_codes;
3970 f2a9dc41 2019-12-13 tracey static const struct got_error *
3971 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3972 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3973 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3974 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3976 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3977 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3978 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3979 17ed4618 2019-06-02 stsp struct stat sb;
3980 20a2ad1c 2020-10-20 stsp char *ondisk_path;
3982 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_NONEXISTENT) {
3983 d64cc78a 2022-01-25 thomas if (a->ignore_missing_paths)
3984 d64cc78a 2022-01-25 thomas return NULL;
3985 d64cc78a 2022-01-25 thomas return got_error_set_errno(ENOENT, relpath);
3988 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3989 17ed4618 2019-06-02 stsp if (ie == NULL)
3990 d5a18ace 2022-01-25 thomas return got_error_path(relpath, GOT_ERR_FILE_STATUS);
3992 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3993 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3994 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3995 9acbc4fa 2019-08-03 stsp return NULL;
3996 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3999 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4000 f2a9dc41 2019-12-13 tracey relpath) == -1)
4001 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4003 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4006 f2a9dc41 2019-12-13 tracey goto done;
4008 766841c2 2020-08-13 stsp if (a->status_codes) {
4009 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4011 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4012 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4015 766841c2 2020-08-13 stsp if (i == ncodes) {
4016 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4017 766841c2 2020-08-13 stsp free(ondisk_path);
4018 766841c2 2020-08-13 stsp return NULL;
4020 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4021 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4022 766841c2 2020-08-13 stsp static char msg[64];
4023 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4024 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4025 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4026 766841c2 2020-08-13 stsp goto done;
4030 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4031 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4032 f2a9dc41 2019-12-13 tracey goto done;
4033 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4034 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4035 f2a9dc41 2019-12-13 tracey goto done;
4037 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4038 d64cc78a 2022-01-25 thomas err = got_error_set_errno(ENOENT, relpath);
4039 d64cc78a 2022-01-25 thomas goto done;
4041 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4042 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4043 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4044 f2a9dc41 2019-12-13 tracey goto done;
4048 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4049 20a2ad1c 2020-10-20 stsp size_t root_len;
4051 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4052 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4053 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4054 12463d8b 2019-12-13 stsp ondisk_path);
4055 12463d8b 2019-12-13 stsp goto done;
4057 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4058 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4059 12463d8b 2019-12-13 stsp goto done;
4062 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4064 20a2ad1c 2020-10-20 stsp char *parent;
4065 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4067 2513f20a 2020-10-20 stsp goto done;
4068 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4069 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4070 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4071 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4072 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4073 20a2ad1c 2020-10-20 stsp ondisk_path);
4076 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4077 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4080 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4082 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4083 f2a9dc41 2019-12-13 tracey if (err)
4084 f2a9dc41 2019-12-13 tracey return err;
4085 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4086 f2a9dc41 2019-12-13 tracey return NULL;
4087 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4088 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4091 2ec1f75b 2019-03-26 stsp const struct got_error *
4092 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4093 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4094 766841c2 2020-08-13 stsp const char *status_codes,
4095 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4096 d64cc78a 2022-01-25 thomas struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4098 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4099 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4100 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4101 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4102 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4104 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4106 2ec1f75b 2019-03-26 stsp return err;
4108 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4110 2ec1f75b 2019-03-26 stsp goto done;
4112 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4113 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4114 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4115 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4116 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4117 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4118 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4119 d64cc78a 2022-01-25 thomas sda.ignore_missing_paths = ignore_missing_paths;
4120 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4122 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4123 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4124 6092c299 2021-10-04 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4128 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4129 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4130 af12c6b9 2019-06-04 stsp err = sync_err;
4132 fb399478 2019-07-12 stsp free(fileindex_path);
4133 2ec1f75b 2019-03-26 stsp if (fileindex)
4134 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4135 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4136 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4137 2ec1f75b 2019-03-26 stsp err = unlockerr;
4138 33aa809d 2019-08-08 stsp return err;
4141 33aa809d 2019-08-08 stsp static const struct got_error *
4142 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4144 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4145 33aa809d 2019-08-08 stsp char *line = NULL;
4146 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4147 33aa809d 2019-08-08 stsp ssize_t linelen;
4149 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4150 33aa809d 2019-08-08 stsp if (linelen == -1) {
4151 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4152 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4153 33aa809d 2019-08-08 stsp goto done;
4155 33aa809d 2019-08-08 stsp return NULL;
4157 33aa809d 2019-08-08 stsp if (outfile) {
4158 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4159 33aa809d 2019-08-08 stsp if (n != linelen) {
4160 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4161 33aa809d 2019-08-08 stsp goto done;
4164 33aa809d 2019-08-08 stsp if (rejectfile) {
4165 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4166 33aa809d 2019-08-08 stsp if (n != linelen)
4167 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4170 33aa809d 2019-08-08 stsp free(line);
4171 2ec1f75b 2019-03-26 stsp return err;
4174 33aa809d 2019-08-08 stsp static const struct got_error *
4175 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4177 33aa809d 2019-08-08 stsp char *line = NULL;
4178 33aa809d 2019-08-08 stsp size_t linesize = 0;
4179 33aa809d 2019-08-08 stsp ssize_t linelen;
4181 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4182 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4183 500467ff 2019-09-25 hiltjo if (ferror(f))
4184 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4185 500467ff 2019-09-25 hiltjo return NULL;
4187 33aa809d 2019-08-08 stsp free(line);
4188 33aa809d 2019-08-08 stsp return NULL;
4191 33aa809d 2019-08-08 stsp static const struct got_error *
4192 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4193 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4194 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4196 33aa809d 2019-08-08 stsp const struct got_error *err;
4198 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4199 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4200 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4202 33aa809d 2019-08-08 stsp return err;
4203 33aa809d 2019-08-08 stsp (*line_cur1)++;
4205 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4206 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4207 33aa809d 2019-08-08 stsp if (rejectfile)
4208 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4210 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4212 33aa809d 2019-08-08 stsp return err;
4213 33aa809d 2019-08-08 stsp (*line_cur2)++;
4215 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4216 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4217 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4219 33aa809d 2019-08-08 stsp return err;
4220 33aa809d 2019-08-08 stsp (*line_cur2)++;
4222 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4223 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4224 33aa809d 2019-08-08 stsp if (rejectfile)
4225 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4227 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4229 33aa809d 2019-08-08 stsp return err;
4230 33aa809d 2019-08-08 stsp (*line_cur1)++;
4233 f1e81a05 2019-08-10 stsp return NULL;
4236 f1e81a05 2019-08-10 stsp static const struct got_error *
4237 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4238 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4240 f1e81a05 2019-08-10 stsp const struct got_error *err;
4242 f1e81a05 2019-08-10 stsp if (outfile) {
4243 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4244 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4245 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4247 f1e81a05 2019-08-10 stsp return err;
4248 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4251 f1e81a05 2019-08-10 stsp if (rejectfile) {
4252 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4253 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4254 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4256 f1e81a05 2019-08-10 stsp return err;
4257 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4261 33aa809d 2019-08-08 stsp return NULL;
4264 33aa809d 2019-08-08 stsp static const struct got_error *
4265 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4266 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4267 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4268 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4269 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4271 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4272 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4273 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4274 33aa809d 2019-08-08 stsp FILE *hunkfile;
4275 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4276 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4279 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4281 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4282 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4283 fe621944 2020-11-10 stsp start_old = cc.left.start;
4284 fe621944 2020-11-10 stsp end_old = cc.left.end;
4285 fe621944 2020-11-10 stsp start_new = cc.right.start;
4286 fe621944 2020-11-10 stsp end_new = cc.right.end;
4288 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4289 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4290 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4292 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4293 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4294 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4296 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4297 fe621944 2020-11-10 stsp if (diff_state == NULL)
4298 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4299 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4301 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4302 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4303 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4304 33aa809d 2019-08-08 stsp goto done;
4307 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4308 fe621944 2020-11-10 stsp diff_result, &cc);
4309 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4310 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4311 33aa809d 2019-08-08 stsp goto done;
4314 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4315 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4316 33aa809d 2019-08-08 stsp goto done;
4319 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4320 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4322 33aa809d 2019-08-08 stsp goto done;
4324 33aa809d 2019-08-08 stsp switch (*choice) {
4325 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4326 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4327 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4329 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4330 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4331 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4333 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4336 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4340 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4341 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4342 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4343 33aa809d 2019-08-08 stsp return err;
4346 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4347 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4348 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4349 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4350 1f1abb7e 2019-08-08 stsp void *progress_arg;
4351 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4352 33aa809d 2019-08-08 stsp void *patch_arg;
4353 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4354 10604dce 2021-09-24 thomas int unlink_added_files;
4357 e20a8b6f 2019-06-04 stsp static const struct got_error *
4358 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4359 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4360 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4361 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4362 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4364 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4365 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4366 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4367 1ebedb77 2019-10-19 stsp int fd2 = -1;
4368 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4369 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4370 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4371 fe621944 2020-11-10 stsp struct stat sb2;
4372 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4373 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4374 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4376 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4378 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4380 33aa809d 2019-08-08 stsp return err;
4382 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4383 fc63f50d 2021-12-31 thomas fd2 = openat(dirfd2, de_name2,
4384 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4385 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4386 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4387 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4388 fa3cef63 2020-07-23 stsp goto done;
4390 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4391 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4392 48b4f239 2021-12-31 thomas if (link_len == -1) {
4393 48b4f239 2021-12-31 thomas return got_error_from_errno2("readlinkat",
4396 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4397 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4400 06340621 2021-12-31 thomas fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4401 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4402 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4403 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4404 fa3cef63 2020-07-23 stsp goto done;
4406 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4407 fa3cef63 2020-07-23 stsp sizeof(link_target));
4408 fa3cef63 2020-07-23 stsp if (link_len == -1)
4409 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4410 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4411 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4414 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4415 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4416 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4417 fa3cef63 2020-07-23 stsp goto done;
4420 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4421 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4422 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4423 fa3cef63 2020-07-23 stsp goto done;
4428 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4429 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4430 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4431 fa3cef63 2020-07-23 stsp goto done;
4433 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4434 fa3cef63 2020-07-23 stsp if (n != link_len) {
4435 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4436 fa3cef63 2020-07-23 stsp goto done;
4438 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4439 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4440 fa3cef63 2020-07-23 stsp goto done;
4442 fa3cef63 2020-07-23 stsp rewind(f2);
4445 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4447 33aa809d 2019-08-08 stsp goto done;
4449 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4451 33aa809d 2019-08-08 stsp goto done;
4453 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4455 33aa809d 2019-08-08 stsp goto done;
4457 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4460 33aa809d 2019-08-08 stsp goto done;
4462 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4464 33aa809d 2019-08-08 stsp goto done;
4466 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4467 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4468 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4469 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4471 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4472 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4473 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4474 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4475 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4476 fe621944 2020-11-10 stsp nchanges++;
4478 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4479 33aa809d 2019-08-08 stsp int choice;
4480 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4481 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4482 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4483 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4484 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4485 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4487 33aa809d 2019-08-08 stsp goto done;
4488 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4489 33aa809d 2019-08-08 stsp have_content = 1;
4490 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4493 1ebedb77 2019-10-19 stsp if (have_content) {
4494 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4495 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4496 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4498 1ebedb77 2019-10-19 stsp goto done;
4500 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4501 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4502 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4503 fa3cef63 2020-07-23 stsp goto done;
4508 33aa809d 2019-08-08 stsp free(id_str);
4510 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4511 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4512 fe621944 2020-11-10 stsp if (err == NULL)
4513 fe621944 2020-11-10 stsp err = free_err;
4514 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4515 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4516 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4517 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4518 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4519 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4520 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4521 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4522 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4523 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4524 33aa809d 2019-08-08 stsp if (err || !have_content) {
4525 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4526 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4527 33aa809d 2019-08-08 stsp free(*path_outfile);
4528 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4530 33aa809d 2019-08-08 stsp free(path1);
4531 33aa809d 2019-08-08 stsp return err;
4534 33aa809d 2019-08-08 stsp static const struct got_error *
4535 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4536 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4537 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4538 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4540 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4541 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4542 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4543 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4544 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4545 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4546 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4547 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4548 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4549 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4551 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4552 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4553 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4554 d3bcc3d1 2019-08-08 stsp return NULL;
4556 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4557 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4558 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4560 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4561 65084dad 2019-08-08 stsp if (ie == NULL)
4562 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4564 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4565 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4566 a129376b 2019-03-28 stsp if (err) {
4567 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4568 a129376b 2019-03-28 stsp goto done;
4569 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4570 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4571 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4572 e20a8b6f 2019-06-04 stsp goto done;
4575 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4576 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4577 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4578 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4579 a129376b 2019-03-28 stsp goto done;
4582 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4583 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4584 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4585 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4586 a129376b 2019-03-28 stsp goto done;
4589 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4590 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4591 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4592 a129376b 2019-03-28 stsp goto done;
4597 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4598 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4599 a9fa2909 2019-07-27 stsp if (err) {
4600 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4601 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4602 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4603 a9fa2909 2019-07-27 stsp goto done;
4605 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4607 a9fa2909 2019-07-27 stsp goto done;
4609 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4611 a9fa2909 2019-07-27 stsp goto done;
4613 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4614 1233e6b6 2020-10-19 stsp free(te_name);
4615 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4616 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4617 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4618 a9fa2909 2019-07-27 stsp goto done;
4622 a129376b 2019-03-28 stsp switch (status) {
4623 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4624 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4625 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4626 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4627 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4629 33aa809d 2019-08-08 stsp goto done;
4630 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4633 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4634 1f1abb7e 2019-08-08 stsp ie->path);
4636 1ee397ad 2019-07-12 stsp goto done;
4637 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4638 10604dce 2021-09-24 thomas if (a->unlink_added_files) {
4639 10604dce 2021-09-24 thomas if (asprintf(&ondisk_path, "%s/%s",
4640 10604dce 2021-09-24 thomas got_worktree_get_root_path(a->worktree),
4641 10604dce 2021-09-24 thomas relpath) == -1) {
4642 10604dce 2021-09-24 thomas err = got_error_from_errno("asprintf");
4643 10604dce 2021-09-24 thomas goto done;
4645 10604dce 2021-09-24 thomas if (unlink(ondisk_path) == -1) {
4646 10604dce 2021-09-24 thomas err = got_error_from_errno2("unlink",
4647 10604dce 2021-09-24 thomas ondisk_path);
4652 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4653 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4654 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4655 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4656 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4658 33aa809d 2019-08-08 stsp goto done;
4659 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4662 33aa809d 2019-08-08 stsp /* fall through */
4663 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4664 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4665 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4666 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4667 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4668 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4669 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4670 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4671 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4673 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4674 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4675 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4677 65084dad 2019-08-08 stsp goto done;
4679 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4680 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4681 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4682 a129376b 2019-03-28 stsp goto done;
4685 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4686 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4687 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4688 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4689 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4690 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4691 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4693 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4694 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4695 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4696 369fd7e5 2020-07-23 stsp path_content);
4699 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4700 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4701 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4702 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4704 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4705 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4706 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4707 369fd7e5 2020-07-23 stsp goto done;
4711 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4712 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4713 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4714 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4715 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4716 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4718 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4720 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4721 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4722 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4723 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4726 a129376b 2019-03-28 stsp goto done;
4727 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4728 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4729 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4730 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4731 437adc9d 2020-12-10 yzhong blob->id.sha1,
4732 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4734 2e1fa222 2020-07-23 stsp goto done;
4736 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4737 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4738 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4747 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4748 33aa809d 2019-08-08 stsp free(path_content);
4749 e20a8b6f 2019-06-04 stsp free(parent_path);
4750 a129376b 2019-03-28 stsp free(tree_path);
4752 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4754 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4755 a129376b 2019-03-28 stsp free(tree_id);
4756 e20a8b6f 2019-06-04 stsp return err;
4759 e20a8b6f 2019-06-04 stsp const struct got_error *
4760 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4761 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4762 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4763 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4764 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4766 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4767 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4768 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4769 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4770 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4771 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4773 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4775 e20a8b6f 2019-06-04 stsp return err;
4777 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4779 e20a8b6f 2019-06-04 stsp goto done;
4781 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4782 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4783 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4784 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4785 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4786 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4787 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4788 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
4789 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4790 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4791 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
4795 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4796 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4797 e20a8b6f 2019-06-04 stsp err = sync_err;
4799 fb399478 2019-07-12 stsp free(fileindex_path);
4800 a129376b 2019-03-28 stsp if (fileindex)
4801 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4802 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4803 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4804 a129376b 2019-03-28 stsp err = unlockerr;
4805 c4296144 2019-05-09 stsp return err;
4808 cf066bf8 2019-05-09 stsp static void
4809 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4811 24519714 2019-05-09 stsp free(ct->path);
4812 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4813 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4814 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4815 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4816 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4817 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4821 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4822 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4823 24519714 2019-05-09 stsp struct got_repository *repo;
4824 24519714 2019-05-09 stsp struct got_worktree *worktree;
4825 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4826 5f8a88c6 2019-08-03 stsp int have_staged_files;
4827 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4830 c4296144 2019-05-09 stsp static const struct got_error *
4831 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4832 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4833 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4834 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4836 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4837 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4838 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4839 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4840 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4841 768aea60 2019-05-09 stsp struct stat sb;
4843 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4844 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4845 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4846 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4847 5f8a88c6 2019-08-03 stsp return NULL;
4849 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4850 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4852 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4853 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4854 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4855 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4856 5f8a88c6 2019-08-03 stsp return NULL;
4859 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4860 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4861 036813ee 2019-05-09 stsp goto done;
4863 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4864 036813ee 2019-05-09 stsp parent_path = strdup("");
4865 69960a46 2019-05-09 stsp if (parent_path == NULL)
4866 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4868 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4870 69960a46 2019-05-09 stsp return err;
4873 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4874 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4875 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4876 c4296144 2019-05-09 stsp goto done;
4879 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4880 768aea60 2019-05-09 stsp relpath) == -1) {
4881 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4882 768aea60 2019-05-09 stsp goto done;
4885 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4886 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4887 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4888 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4889 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4890 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4891 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4892 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4894 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4895 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4898 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4899 0aeb8099 2020-07-23 stsp goto done;
4901 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4902 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4903 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4904 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4905 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4906 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4907 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4908 12463d8b 2019-12-13 stsp ct->ondisk_path);
4909 12463d8b 2019-12-13 stsp goto done;
4911 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4912 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4913 768aea60 2019-05-09 stsp goto done;
4915 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4918 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4919 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4920 44d03001 2019-05-09 stsp relpath) == -1) {
4921 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4922 44d03001 2019-05-09 stsp goto done;
4925 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4926 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4927 35213c7c 2020-07-23 stsp int is_bad_symlink;
4928 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4929 35213c7c 2020-07-23 stsp ssize_t target_len;
4930 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4931 35213c7c 2020-07-23 stsp sizeof(target_path));
4932 35213c7c 2020-07-23 stsp if (target_len == -1) {
4933 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4934 35213c7c 2020-07-23 stsp ct->ondisk_path);
4935 35213c7c 2020-07-23 stsp goto done;
4937 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4938 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4940 35213c7c 2020-07-23 stsp goto done;
4941 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4942 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4943 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4944 35213c7c 2020-07-23 stsp goto done;
4949 cf066bf8 2019-05-09 stsp ct->status = status;
4950 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4951 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4952 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4953 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4954 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4955 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4956 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4957 b416585c 2019-05-13 stsp goto done;
4959 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4960 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4961 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4962 f0b75401 2019-08-03 stsp goto done;
4965 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4966 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4967 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4968 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4969 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4970 036813ee 2019-05-09 stsp goto done;
4973 24519714 2019-05-09 stsp ct->path = strdup(path);
4974 24519714 2019-05-09 stsp if (ct->path == NULL) {
4975 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4976 24519714 2019-05-09 stsp goto done;
4978 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4980 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4981 ed175427 2019-05-09 stsp free_commitable(ct);
4982 24519714 2019-05-09 stsp free(parent_path);
4983 036813ee 2019-05-09 stsp free(path);
4984 a129376b 2019-03-28 stsp return err;
4987 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4988 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4989 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4990 036813ee 2019-05-09 stsp struct got_repository *);
4992 ed175427 2019-05-09 stsp static const struct got_error *
4993 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4994 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4995 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4996 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4997 afa376bf 2019-05-09 stsp struct got_repository *repo)
4999 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5000 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5001 036813ee 2019-05-09 stsp char *subpath;
5003 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5004 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5005 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5007 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5009 ed175427 2019-05-09 stsp return err;
5011 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5012 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5013 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5014 036813ee 2019-05-09 stsp free(subpath);
5015 036813ee 2019-05-09 stsp return err;
5018 036813ee 2019-05-09 stsp static const struct got_error *
5019 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5021 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5022 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5024 036813ee 2019-05-09 stsp *match = 0;
5026 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5027 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5028 0f63689d 2019-05-10 stsp return NULL;
5031 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5033 0f63689d 2019-05-10 stsp return err;
5034 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5035 036813ee 2019-05-09 stsp free(ct_parent_path);
5036 036813ee 2019-05-09 stsp return err;
5039 768aea60 2019-05-09 stsp static mode_t
5040 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5042 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5043 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5045 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5048 036813ee 2019-05-09 stsp static const struct got_error *
5049 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5050 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5052 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5054 036813ee 2019-05-09 stsp *new_te = NULL;
5056 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5058 036813ee 2019-05-09 stsp goto done;
5060 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5062 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5063 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5064 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5066 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5068 036813ee 2019-05-09 stsp if (err && *new_te) {
5069 56e0773d 2019-11-28 stsp free(*new_te);
5070 036813ee 2019-05-09 stsp *new_te = NULL;
5072 036813ee 2019-05-09 stsp return err;
5075 036813ee 2019-05-09 stsp static const struct got_error *
5076 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5077 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5079 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5080 102b254e 2020-10-19 stsp char *ct_name = NULL;
5082 036813ee 2019-05-09 stsp *new_te = NULL;
5084 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5085 036813ee 2019-05-09 stsp if (*new_te == NULL)
5086 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5088 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5090 036813ee 2019-05-09 stsp goto done;
5091 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5092 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5093 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5094 036813ee 2019-05-09 stsp goto done;
5097 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5099 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5100 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5101 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5103 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5105 102b254e 2020-10-19 stsp free(ct_name);
5106 036813ee 2019-05-09 stsp if (err && *new_te) {
5107 56e0773d 2019-11-28 stsp free(*new_te);
5108 036813ee 2019-05-09 stsp *new_te = NULL;
5110 036813ee 2019-05-09 stsp return err;
5113 036813ee 2019-05-09 stsp static const struct got_error *
5114 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5115 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5117 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5118 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5120 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5122 036813ee 2019-05-09 stsp return err;
5123 036813ee 2019-05-09 stsp if (new_pe == NULL)
5124 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5125 036813ee 2019-05-09 stsp return NULL;
5128 afa376bf 2019-05-09 stsp static const struct got_error *
5129 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5130 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5132 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5133 5f8a88c6 2019-08-03 stsp unsigned char status;
5135 ae1e948a 2021-09-28 thomas if (status_cb == NULL) /* no commit progress output desired */
5136 ae1e948a 2021-09-28 thomas return NULL;
5138 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5139 afa376bf 2019-05-09 stsp ct_path++;
5141 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5142 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5144 5f8a88c6 2019-08-03 stsp status = ct->status;
5146 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5147 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5150 036813ee 2019-05-09 stsp static const struct got_error *
5151 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5152 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5154 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5155 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5156 44d03001 2019-05-09 stsp char *te_path;
5158 44d03001 2019-05-09 stsp *modified = 0;
5160 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5161 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5162 44d03001 2019-05-09 stsp te->name) == -1)
5163 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5165 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5166 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5167 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5168 44d03001 2019-05-09 stsp strlen(te_path));
5169 62d463ca 2020-10-20 naddy if (*modified)
5173 44d03001 2019-05-09 stsp free(te_path);
5174 44d03001 2019-05-09 stsp return err;
5177 44d03001 2019-05-09 stsp static const struct got_error *
5178 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5179 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5180 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5182 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5183 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5185 036813ee 2019-05-09 stsp *ctp = NULL;
5187 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5188 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5189 036813ee 2019-05-09 stsp char *ct_name = NULL;
5190 036813ee 2019-05-09 stsp int path_matches;
5192 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5193 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5194 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5195 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5198 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5199 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5203 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5206 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5208 036813ee 2019-05-09 stsp return err;
5209 036813ee 2019-05-09 stsp if (!path_matches)
5212 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5214 d34b633e 2020-10-19 stsp return err;
5216 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5217 d34b633e 2020-10-19 stsp free(ct_name);
5220 d34b633e 2020-10-19 stsp free(ct_name);
5222 036813ee 2019-05-09 stsp *ctp = ct;
5226 2b496619 2019-07-10 stsp return err;
5229 2b496619 2019-07-10 stsp static const struct got_error *
5230 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5231 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5232 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5233 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5234 2b496619 2019-07-10 stsp struct got_repository *repo)
5236 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5237 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5238 2b496619 2019-07-10 stsp char *subtree_path;
5239 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5240 ba580f68 2020-03-22 stsp int nentries;
5242 2b496619 2019-07-10 stsp *new_tep = NULL;
5244 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5245 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5246 2b496619 2019-07-10 stsp child_path) == -1)
5247 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5249 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5250 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5251 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5252 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5254 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5255 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5256 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5257 2b496619 2019-07-10 stsp goto done;
5259 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5260 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5261 2b496619 2019-07-10 stsp if (err) {
5262 56e0773d 2019-11-28 stsp free(new_te);
5263 2b496619 2019-07-10 stsp goto done;
5265 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5268 2b496619 2019-07-10 stsp free(subtree_path);
5269 2b496619 2019-07-10 stsp if (err == NULL)
5270 2b496619 2019-07-10 stsp *new_tep = new_te;
5271 036813ee 2019-05-09 stsp return err;
5274 036813ee 2019-05-09 stsp static const struct got_error *
5275 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5276 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5277 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5278 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5279 036813ee 2019-05-09 stsp struct got_repository *repo)
5281 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5282 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5283 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5284 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5286 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5287 ba580f68 2020-03-22 stsp *nentries = 0;
5289 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5290 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5291 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5292 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5294 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5295 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5296 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5299 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5300 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5303 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5304 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5306 036813ee 2019-05-09 stsp goto done;
5308 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5309 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5310 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5312 036813ee 2019-05-09 stsp goto done;
5313 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5315 afa376bf 2019-05-09 stsp goto done;
5316 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5317 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5319 2f51b5b3 2019-05-09 stsp goto done;
5320 ba580f68 2020-03-22 stsp (*nentries)++;
5322 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5323 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5324 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5325 2b496619 2019-07-10 stsp == NULL) {
5326 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5327 2b496619 2019-07-10 stsp child_path, path_base_tree,
5328 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5331 2b496619 2019-07-10 stsp goto done;
5332 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5334 2b496619 2019-07-10 stsp goto done;
5335 ba580f68 2020-03-22 stsp (*nentries)++;
5340 2f51b5b3 2019-05-09 stsp if (base_tree) {
5341 56e0773d 2019-11-28 stsp int i, nbase_entries;
5342 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5343 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5344 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5345 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5347 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5348 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5349 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5350 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5352 63c5ca5d 2019-08-24 stsp goto done;
5353 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5355 63c5ca5d 2019-08-24 stsp goto done;
5356 ba580f68 2020-03-22 stsp (*nentries)++;
5360 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5361 44d03001 2019-05-09 stsp int modified;
5362 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5364 036813ee 2019-05-09 stsp goto done;
5365 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5366 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5368 2f51b5b3 2019-05-09 stsp goto done;
5369 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5370 44d03001 2019-05-09 stsp if (modified) {
5371 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5372 ba580f68 2020-03-22 stsp int nsubentries;
5373 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5374 ba580f68 2020-03-22 stsp &nsubentries, te,
5375 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5376 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5378 44d03001 2019-05-09 stsp goto done;
5379 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5380 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5381 ba580f68 2020-03-22 stsp free(new_id);
5384 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5385 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5386 56e0773d 2019-11-28 stsp free(new_id);
5388 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5390 036813ee 2019-05-09 stsp goto done;
5391 ba580f68 2020-03-22 stsp (*nentries)++;
5395 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5396 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5398 f66c734c 2019-09-22 stsp goto done;
5400 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5401 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5402 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5403 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5404 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5405 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5407 2f51b5b3 2019-05-09 stsp goto done;
5408 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5410 2f51b5b3 2019-05-09 stsp goto done;
5411 ba580f68 2020-03-22 stsp (*nentries)++;
5413 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5414 b416585c 2019-05-13 stsp status_arg);
5416 afa376bf 2019-05-09 stsp goto done;
5418 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5419 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5421 2f51b5b3 2019-05-09 stsp goto done;
5422 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5424 2f51b5b3 2019-05-09 stsp goto done;
5425 ba580f68 2020-03-22 stsp (*nentries)++;
5430 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5431 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5433 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5434 2e1fa222 2020-07-23 stsp return err;
5437 2e1fa222 2020-07-23 stsp static const struct got_error *
5438 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5439 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5440 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5441 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5443 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5444 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5445 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5447 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5448 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5449 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5451 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5453 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5454 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5455 437adc9d 2020-12-10 yzhong if (err)
5456 437adc9d 2020-12-10 yzhong goto done;
5459 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5460 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5461 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5462 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5463 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5464 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5465 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5466 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5468 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5469 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5470 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5471 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5472 72fd46fa 2019-09-06 stsp !have_staged_files);
5474 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5475 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5476 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5477 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5478 72fd46fa 2019-09-06 stsp !have_staged_files);
5480 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5482 437adc9d 2020-12-10 yzhong goto done;
5483 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5484 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5485 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5486 3969253a 2020-03-07 stsp if (err) {
5487 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5488 437adc9d 2020-12-10 yzhong goto done;
5490 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5491 3969253a 2020-03-07 stsp if (err) {
5492 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5493 437adc9d 2020-12-10 yzhong goto done;
5496 437adc9d 2020-12-10 yzhong free(relpath);
5497 437adc9d 2020-12-10 yzhong relpath = NULL;
5500 437adc9d 2020-12-10 yzhong free(relpath);
5501 d56d26ce 2019-05-10 stsp return err;
5505 d56d26ce 2019-05-10 stsp static const struct got_error *
5506 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5507 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5508 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5509 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5510 735ef5ac 2019-08-03 stsp int ood_errcode)
5512 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5513 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5515 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5516 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5517 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5518 1a36436d 2019-06-10 stsp return NULL;
5520 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5521 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5523 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5524 735ef5ac 2019-08-03 stsp in_repo_path);
5525 9bead371 2019-07-28 stsp if (err) {
5526 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5527 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5528 1a36436d 2019-06-10 stsp goto done;
5529 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5530 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5532 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5533 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5534 735ef5ac 2019-08-03 stsp in_repo_path);
5535 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5536 1a36436d 2019-06-10 stsp goto done;
5537 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5541 1a36436d 2019-06-10 stsp return err;
5544 c4296144 2019-05-09 stsp const struct got_error *
5545 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5546 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5547 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id,
5548 10604dce 2021-09-24 thomas struct got_object_id *parent_id2,
5549 10604dce 2021-09-24 thomas struct got_worktree *worktree,
5550 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5551 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5552 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5553 afa376bf 2019-05-09 stsp struct got_repository *repo)
5555 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5556 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5557 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5558 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5559 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5560 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5561 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5562 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5563 10604dce 2021-09-24 thomas int nentries, nparents = 0;
5564 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5565 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5566 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5568 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5570 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5572 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5574 588edf97 2019-05-10 stsp goto done;
5576 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5578 588edf97 2019-05-10 stsp goto done;
5580 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5581 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5586 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5587 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5591 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5592 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5593 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5594 cf066bf8 2019-05-09 stsp char *ondisk_path;
5596 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5597 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5598 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5601 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5602 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5603 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5606 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5607 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5608 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5609 cf066bf8 2019-05-09 stsp goto done;
5611 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5612 2e1fa222 2020-07-23 stsp free(ondisk_path);
5614 cf066bf8 2019-05-09 stsp goto done;
5617 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5618 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5619 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5621 036813ee 2019-05-09 stsp goto done;
5623 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5625 de18fc63 2019-05-09 stsp goto done;
5626 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5627 10604dce 2021-09-24 thomas nparents++;
5628 10604dce 2021-09-24 thomas if (parent_id2) {
5629 10604dce 2021-09-24 thomas err = got_object_qid_alloc(&pid, parent_id2);
5630 10604dce 2021-09-24 thomas if (err)
5631 10604dce 2021-09-24 thomas goto done;
5632 10604dce 2021-09-24 thomas STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5633 10604dce 2021-09-24 thomas nparents++;
5635 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5636 10604dce 2021-09-24 thomas nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5637 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5638 33ad4cbe 2019-05-12 jcs free(logmsg);
5640 9d40349a 2019-05-09 stsp goto done;
5642 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5643 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5644 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5645 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5646 09f5bd90 2019-05-09 stsp goto done;
5648 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5649 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5651 09f5bd90 2019-05-09 stsp goto done;
5652 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5654 ebf99748 2019-05-09 stsp goto done;
5655 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5656 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5657 09f5bd90 2019-05-09 stsp goto done;
5659 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5660 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5662 f2c16586 2019-05-09 stsp goto done;
5663 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5665 f2c16586 2019-05-09 stsp goto done;
5667 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5669 09f5bd90 2019-05-09 stsp goto done;
5671 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5673 ebf99748 2019-05-09 stsp goto done;
5675 10604dce 2021-09-24 thomas got_object_id_queue_free(&parent_ids);
5676 588edf97 2019-05-10 stsp if (head_tree)
5677 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5678 588edf97 2019-05-10 stsp if (head_commit)
5679 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5680 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5681 2f17228e 2019-05-12 stsp if (head_ref2) {
5682 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5683 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5684 2f17228e 2019-05-12 stsp err = unlockerr;
5685 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5687 39cd0ff6 2019-07-12 stsp return err;
5690 5c1e53bc 2019-07-28 stsp static const struct got_error *
5691 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5692 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5694 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5695 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5697 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5698 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5699 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5701 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5702 5c1e53bc 2019-07-28 stsp ct_path++;
5704 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5705 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5709 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5710 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5712 5c1e53bc 2019-07-28 stsp return NULL;
5715 f0b75401 2019-08-03 stsp static const struct got_error *
5716 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5718 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5720 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5721 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5722 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5725 f0b75401 2019-08-03 stsp return NULL;
5728 5f8a88c6 2019-08-03 stsp static const struct got_error *
5729 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5730 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5732 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5733 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5735 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5736 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5738 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5739 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5740 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5741 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5742 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5743 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5746 5f8a88c6 2019-08-03 stsp return NULL;
5749 39cd0ff6 2019-07-12 stsp const struct got_error *
5750 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5751 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5752 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5753 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5754 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5755 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5757 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5758 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5759 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5760 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5761 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5762 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5763 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5764 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5765 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5767 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5769 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5771 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5773 39cd0ff6 2019-07-12 stsp goto done;
5775 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5777 39cd0ff6 2019-07-12 stsp goto done;
5779 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5781 39cd0ff6 2019-07-12 stsp goto done;
5783 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5785 39cd0ff6 2019-07-12 stsp goto done;
5787 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5788 5f8a88c6 2019-08-03 stsp &have_staged_files);
5789 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5790 5f8a88c6 2019-08-03 stsp goto done;
5791 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5792 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5794 5f8a88c6 2019-08-03 stsp goto done;
5797 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5798 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5799 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5800 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5801 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5802 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5803 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5804 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5805 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
5807 5c1e53bc 2019-07-28 stsp goto done;
5810 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5811 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5812 39cd0ff6 2019-07-12 stsp goto done;
5815 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5816 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5818 5c1e53bc 2019-07-28 stsp goto done;
5821 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5822 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5823 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5825 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5826 f0b75401 2019-08-03 stsp ct_path++;
5827 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5828 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5829 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5831 b50cabdf 2019-07-12 stsp goto done;
5835 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5836 10604dce 2021-09-24 thomas head_commit_id, NULL, worktree, author, committer,
5837 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5839 39cd0ff6 2019-07-12 stsp goto done;
5841 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5842 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5843 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5844 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5845 39cd0ff6 2019-07-12 stsp err = sync_err;
5847 39cd0ff6 2019-07-12 stsp if (fileindex)
5848 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5849 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5850 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5851 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5852 39cd0ff6 2019-07-12 stsp err = unlockerr;
5853 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5854 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5855 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5857 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5858 c4296144 2019-05-09 stsp return err;
5861 8656d6c4 2019-05-20 stsp const char *
5862 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5864 8656d6c4 2019-05-20 stsp return ct->path;
5867 8656d6c4 2019-05-20 stsp unsigned int
5868 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5870 8656d6c4 2019-05-20 stsp return ct->status;
5873 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5874 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5875 818c7501 2019-07-11 stsp struct got_repository *repo;
5878 818c7501 2019-07-11 stsp static const struct got_error *
5879 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5881 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5882 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5883 818c7501 2019-07-11 stsp unsigned char status;
5884 818c7501 2019-07-11 stsp struct stat sb;
5885 818c7501 2019-07-11 stsp char *ondisk_path;
5887 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5888 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5889 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5890 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5892 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5894 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5896 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5897 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5898 818c7501 2019-07-11 stsp free(ondisk_path);
5900 818c7501 2019-07-11 stsp return err;
5902 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5903 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5904 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5905 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5907 818c7501 2019-07-11 stsp return NULL;
5910 818c7501 2019-07-11 stsp const struct got_error *
5911 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5912 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5913 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5914 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5916 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5917 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5918 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5919 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5920 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5921 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5922 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5924 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5925 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5926 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5928 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5930 818c7501 2019-07-11 stsp return err;
5932 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5934 818c7501 2019-07-11 stsp goto done;
5936 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5937 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5938 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5941 818c7501 2019-07-11 stsp goto done;
5943 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5945 818c7501 2019-07-11 stsp goto done;
5947 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5949 818c7501 2019-07-11 stsp goto done;
5951 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5953 818c7501 2019-07-11 stsp goto done;
5955 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5958 e51d7b55 2020-01-04 stsp goto done;
5960 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5962 818c7501 2019-07-11 stsp goto done;
5963 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5964 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5965 e51d7b55 2020-01-04 stsp goto done;
5968 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5969 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5971 818c7501 2019-07-11 stsp goto done;
5972 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5974 818c7501 2019-07-11 stsp goto done;
5976 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5978 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5980 818c7501 2019-07-11 stsp goto done;
5982 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5984 818c7501 2019-07-11 stsp goto done;
5986 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5987 818c7501 2019-07-11 stsp worktree->base_commit_id);
5989 818c7501 2019-07-11 stsp goto done;
5990 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5992 818c7501 2019-07-11 stsp goto done;
5994 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5996 818c7501 2019-07-11 stsp goto done;
5998 818c7501 2019-07-11 stsp free(fileindex_path);
5999 818c7501 2019-07-11 stsp free(tmp_branch_name);
6000 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6001 818c7501 2019-07-11 stsp free(branch_ref_name);
6002 818c7501 2019-07-11 stsp if (branch_ref)
6003 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6004 818c7501 2019-07-11 stsp if (wt_branch)
6005 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6006 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6007 818c7501 2019-07-11 stsp if (err) {
6008 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6009 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6010 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6012 818c7501 2019-07-11 stsp if (*tmp_branch) {
6013 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6014 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6016 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6017 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6018 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6020 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6022 818c7501 2019-07-11 stsp return err;
6025 818c7501 2019-07-11 stsp const struct got_error *
6026 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6027 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6028 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6029 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6031 818c7501 2019-07-11 stsp const struct got_error *err;
6032 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6033 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6034 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6035 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6036 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6038 818c7501 2019-07-11 stsp *commit_id = NULL;
6039 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6040 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6041 3e3a69f1 2019-07-25 stsp *branch = NULL;
6042 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6044 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6046 3e3a69f1 2019-07-25 stsp return err;
6048 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6050 f032f1f7 2019-08-04 stsp goto done;
6052 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6053 f032f1f7 2019-08-04 stsp &have_staged_files);
6054 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6055 f032f1f7 2019-08-04 stsp goto done;
6056 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6057 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6058 3e3a69f1 2019-07-25 stsp goto done;
6061 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6063 f032f1f7 2019-08-04 stsp goto done;
6065 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6067 818c7501 2019-07-11 stsp goto done;
6069 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6071 818c7501 2019-07-11 stsp goto done;
6073 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6075 818c7501 2019-07-11 stsp goto done;
6077 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6079 818c7501 2019-07-11 stsp goto done;
6081 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6082 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6084 818c7501 2019-07-11 stsp goto done;
6086 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6088 818c7501 2019-07-11 stsp goto done;
6090 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6092 818c7501 2019-07-11 stsp goto done;
6094 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6095 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6097 818c7501 2019-07-11 stsp goto done;
6099 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6101 818c7501 2019-07-11 stsp goto done;
6103 818c7501 2019-07-11 stsp free(commit_ref_name);
6104 818c7501 2019-07-11 stsp free(branch_ref_name);
6105 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6106 818c7501 2019-07-11 stsp if (commit_ref)
6107 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6108 818c7501 2019-07-11 stsp if (branch_ref)
6109 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6110 818c7501 2019-07-11 stsp if (err) {
6111 818c7501 2019-07-11 stsp free(*commit_id);
6112 818c7501 2019-07-11 stsp *commit_id = NULL;
6113 818c7501 2019-07-11 stsp if (*tmp_branch) {
6114 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6115 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6117 818c7501 2019-07-11 stsp if (*new_base_branch) {
6118 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6119 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6121 818c7501 2019-07-11 stsp if (*branch) {
6122 818c7501 2019-07-11 stsp got_ref_close(*branch);
6123 818c7501 2019-07-11 stsp *branch = NULL;
6125 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6126 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6127 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6129 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6131 818c7501 2019-07-11 stsp return err;
6134 818c7501 2019-07-11 stsp const struct got_error *
6135 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6137 818c7501 2019-07-11 stsp const struct got_error *err;
6138 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6140 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6142 818c7501 2019-07-11 stsp return err;
6144 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6145 818c7501 2019-07-11 stsp free(tmp_branch_name);
6146 818c7501 2019-07-11 stsp return NULL;
6149 818c7501 2019-07-11 stsp static const struct got_error *
6150 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6151 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6153 0ebf8283 2019-07-24 stsp *logmsg = arg;
6154 818c7501 2019-07-11 stsp return NULL;
6157 818c7501 2019-07-11 stsp static const struct got_error *
6158 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6159 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6160 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6161 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6163 818c7501 2019-07-11 stsp return NULL;
6166 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6167 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6168 01757395 2019-07-12 stsp void *progress_arg;
6169 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6172 01757395 2019-07-12 stsp static const struct got_error *
6173 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6175 01757395 2019-07-12 stsp const struct got_error *err;
6176 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6178 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6180 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6182 01757395 2019-07-12 stsp return err;
6184 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6185 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6186 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6187 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6188 01757395 2019-07-12 stsp return NULL;
6190 01757395 2019-07-12 stsp p = strdup(path);
6191 01757395 2019-07-12 stsp if (p == NULL)
6192 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6194 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6195 01757395 2019-07-12 stsp if (err || new == NULL)
6197 01757395 2019-07-12 stsp return err;
6201 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6203 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6205 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6206 01757395 2019-07-12 stsp free((char *)pe->path);
6208 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6211 0ebf8283 2019-07-24 stsp static const struct got_error *
6212 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6213 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6215 818c7501 2019-07-11 stsp const struct got_error *err;
6216 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6218 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6219 818c7501 2019-07-11 stsp if (err) {
6220 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6221 818c7501 2019-07-11 stsp goto done;
6222 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6224 818c7501 2019-07-11 stsp goto done;
6225 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6227 818c7501 2019-07-11 stsp goto done;
6228 de05890f 2020-03-05 stsp } else if (is_rebase) {
6229 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6232 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6234 818c7501 2019-07-11 stsp goto done;
6235 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6236 818c7501 2019-07-11 stsp free(stored_id);
6237 818c7501 2019-07-11 stsp if (cmp != 0) {
6238 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6239 818c7501 2019-07-11 stsp goto done;
6243 0ebf8283 2019-07-24 stsp if (commit_ref)
6244 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6245 0ebf8283 2019-07-24 stsp return err;
6248 0ebf8283 2019-07-24 stsp static const struct got_error *
6249 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6250 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6251 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6252 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6253 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6254 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6256 0ebf8283 2019-07-24 stsp const struct got_error *err;
6257 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6258 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6259 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6261 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6263 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6265 0ebf8283 2019-07-24 stsp return err;
6267 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6268 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6269 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6270 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6271 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6272 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6273 818c7501 2019-07-11 stsp if (commit_ref)
6274 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6275 818c7501 2019-07-11 stsp return err;
6278 818c7501 2019-07-11 stsp const struct got_error *
6279 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6280 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6281 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6282 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6283 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6284 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6286 0ebf8283 2019-07-24 stsp const struct got_error *err;
6287 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6289 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6291 0ebf8283 2019-07-24 stsp return err;
6293 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6295 0ebf8283 2019-07-24 stsp goto done;
6297 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6298 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6299 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6301 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6302 0ebf8283 2019-07-24 stsp return err;
6305 0ebf8283 2019-07-24 stsp const struct got_error *
6306 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6307 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6308 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6309 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6310 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6311 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6313 0ebf8283 2019-07-24 stsp const struct got_error *err;
6314 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6316 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6318 0ebf8283 2019-07-24 stsp return err;
6320 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6322 0ebf8283 2019-07-24 stsp goto done;
6324 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6325 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6326 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6328 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6329 0ebf8283 2019-07-24 stsp return err;
6332 0ebf8283 2019-07-24 stsp static const struct got_error *
6333 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6334 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6335 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6336 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6337 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6339 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6340 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6341 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6342 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6343 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6344 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6345 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6347 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6348 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6350 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6352 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6354 3e3a69f1 2019-07-25 stsp return err;
6356 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6357 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6358 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6359 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6361 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6362 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6364 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6365 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6366 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6367 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6368 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6369 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6371 01757395 2019-07-12 stsp if (merged_paths) {
6372 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6373 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6374 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6375 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6378 01757395 2019-07-12 stsp goto done;
6381 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6382 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6384 01757395 2019-07-12 stsp goto done;
6387 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6388 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6389 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6391 a0e95631 2019-07-12 stsp goto done;
6392 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6393 a0e95631 2019-07-12 stsp goto done;
6396 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6398 edd02c5e 2019-07-11 stsp goto done;
6400 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6402 818c7501 2019-07-11 stsp goto done;
6404 5943eee2 2019-08-13 stsp if (new_logmsg) {
6405 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6406 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6407 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6408 5943eee2 2019-08-13 stsp goto done;
6411 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6413 5943eee2 2019-08-13 stsp goto done;
6416 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6417 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6418 10604dce 2021-09-24 thomas NULL, worktree, got_object_commit_get_author(orig_commit),
6419 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6420 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6422 a0e95631 2019-07-12 stsp goto done;
6424 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6426 a0e95631 2019-07-12 stsp goto done;
6428 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6430 a0e95631 2019-07-12 stsp goto done;
6432 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6433 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6434 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6435 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6436 a0e95631 2019-07-12 stsp err = sync_err;
6438 a0e95631 2019-07-12 stsp free(fileindex_path);
6439 a0e95631 2019-07-12 stsp free(head_commit_id);
6440 a0e95631 2019-07-12 stsp if (head_ref)
6441 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6442 818c7501 2019-07-11 stsp if (err) {
6443 818c7501 2019-07-11 stsp free(*new_commit_id);
6444 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6446 818c7501 2019-07-11 stsp return err;
6449 818c7501 2019-07-11 stsp const struct got_error *
6450 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6451 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6452 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6453 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6454 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6456 0ebf8283 2019-07-24 stsp const struct got_error *err;
6457 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6458 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6459 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6461 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6463 0ebf8283 2019-07-24 stsp return err;
6465 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6467 0ebf8283 2019-07-24 stsp goto done;
6468 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6470 0ebf8283 2019-07-24 stsp goto done;
6471 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6472 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6473 0ebf8283 2019-07-24 stsp goto done;
6476 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6477 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6479 0ebf8283 2019-07-24 stsp if (commit_ref)
6480 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6481 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6482 0ebf8283 2019-07-24 stsp free(commit_id);
6483 0ebf8283 2019-07-24 stsp return err;
6486 0ebf8283 2019-07-24 stsp const struct got_error *
6487 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6488 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6489 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6490 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6491 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6492 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6494 0ebf8283 2019-07-24 stsp const struct got_error *err;
6495 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6496 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6498 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6500 0ebf8283 2019-07-24 stsp return err;
6502 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6504 0ebf8283 2019-07-24 stsp goto done;
6506 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6507 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6509 0ebf8283 2019-07-24 stsp if (commit_ref)
6510 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6511 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6512 0ebf8283 2019-07-24 stsp return err;
6515 0ebf8283 2019-07-24 stsp const struct got_error *
6516 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6517 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6519 3e3a69f1 2019-07-25 stsp if (fileindex)
6520 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6521 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6524 69844fba 2019-07-11 stsp static const struct got_error *
6525 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6527 69844fba 2019-07-11 stsp const struct got_error *err;
6528 69844fba 2019-07-11 stsp struct got_reference *ref;
6530 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6531 69844fba 2019-07-11 stsp if (err) {
6532 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6533 69844fba 2019-07-11 stsp return NULL;
6534 69844fba 2019-07-11 stsp return err;
6537 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6538 69844fba 2019-07-11 stsp got_ref_close(ref);
6539 69844fba 2019-07-11 stsp return err;
6542 69844fba 2019-07-11 stsp static const struct got_error *
6543 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6545 69844fba 2019-07-11 stsp const struct got_error *err;
6546 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6547 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6549 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6551 69844fba 2019-07-11 stsp goto done;
6552 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6554 69844fba 2019-07-11 stsp goto done;
6556 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6558 69844fba 2019-07-11 stsp goto done;
6559 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6561 69844fba 2019-07-11 stsp goto done;
6563 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6565 69844fba 2019-07-11 stsp goto done;
6566 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6568 69844fba 2019-07-11 stsp goto done;
6570 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6572 69844fba 2019-07-11 stsp goto done;
6573 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6575 69844fba 2019-07-11 stsp goto done;
6578 69844fba 2019-07-11 stsp free(tmp_branch_name);
6579 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6580 69844fba 2019-07-11 stsp free(branch_ref_name);
6581 69844fba 2019-07-11 stsp free(commit_ref_name);
6582 e600f124 2021-03-21 stsp return err;
6585 e600f124 2021-03-21 stsp const struct got_error *
6586 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6587 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6589 e600f124 2021-03-21 stsp const struct got_error *err;
6590 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6591 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6592 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6593 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6594 e600f124 2021-03-21 stsp char *refname = NULL;
6596 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6597 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6598 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6599 e600f124 2021-03-21 stsp branch_name += 11;
6601 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6603 e600f124 2021-03-21 stsp return err;
6605 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6606 e600f124 2021-03-21 stsp new_id_str) == -1) {
6607 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6608 e600f124 2021-03-21 stsp goto done;
6611 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6613 e600f124 2021-03-21 stsp goto done;
6615 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6617 e600f124 2021-03-21 stsp goto done;
6619 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6621 e600f124 2021-03-21 stsp free(new_id_str);
6622 e600f124 2021-03-21 stsp free(refname);
6623 e600f124 2021-03-21 stsp free(old_commit_id);
6625 e600f124 2021-03-21 stsp got_ref_close(ref);
6626 69844fba 2019-07-11 stsp return err;
6629 818c7501 2019-07-11 stsp const struct got_error *
6630 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6631 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6632 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6633 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6635 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6636 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6637 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6639 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6641 818c7501 2019-07-11 stsp return err;
6643 e600f124 2021-03-21 stsp if (create_backup) {
6644 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6645 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6647 e600f124 2021-03-21 stsp goto done;
6650 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6652 818c7501 2019-07-11 stsp goto done;
6654 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6656 818c7501 2019-07-11 stsp goto done;
6658 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6660 818c7501 2019-07-11 stsp goto done;
6662 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6664 a615e0e7 2020-12-16 stsp goto done;
6666 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6668 a615e0e7 2020-12-16 stsp goto done;
6669 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6670 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6671 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6672 a615e0e7 2020-12-16 stsp err = sync_err;
6674 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6675 a615e0e7 2020-12-16 stsp free(fileindex_path);
6676 818c7501 2019-07-11 stsp free(new_head_commit_id);
6677 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6678 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6679 818c7501 2019-07-11 stsp err = unlockerr;
6680 818c7501 2019-07-11 stsp return err;
6683 818c7501 2019-07-11 stsp const struct got_error *
6684 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6685 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6686 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6687 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6689 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6690 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6691 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6692 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6693 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6694 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6696 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6698 818c7501 2019-07-11 stsp return err;
6700 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6701 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6703 818c7501 2019-07-11 stsp goto done;
6705 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6707 818c7501 2019-07-11 stsp goto done;
6710 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6711 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6712 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6714 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6716 818c7501 2019-07-11 stsp goto done;
6718 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6720 818c7501 2019-07-11 stsp goto done;
6722 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6723 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6725 ca355955 2019-07-12 stsp goto done;
6727 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6729 ca355955 2019-07-12 stsp goto done;
6731 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6733 818c7501 2019-07-11 stsp goto done;
6735 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6736 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6737 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6738 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6739 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6740 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6741 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6742 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
6743 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6744 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
6746 1f1abb7e 2019-08-08 stsp goto sync;
6748 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6749 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6751 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6752 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6753 ca355955 2019-07-12 stsp err = sync_err;
6755 818c7501 2019-07-11 stsp got_ref_close(resolved);
6756 a3a2faf2 2019-07-12 stsp free(tree_id);
6757 818c7501 2019-07-11 stsp free(commit_id);
6758 0ebf8283 2019-07-24 stsp if (fileindex)
6759 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6760 0ebf8283 2019-07-24 stsp free(fileindex_path);
6762 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6763 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6764 0ebf8283 2019-07-24 stsp err = unlockerr;
6765 0ebf8283 2019-07-24 stsp return err;
6768 0ebf8283 2019-07-24 stsp const struct got_error *
6769 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6770 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6771 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6772 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6774 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6775 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6776 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6777 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6778 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6779 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6780 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6781 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6783 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6784 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6785 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6786 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6788 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6790 0ebf8283 2019-07-24 stsp return err;
6792 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6794 0ebf8283 2019-07-24 stsp goto done;
6796 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6797 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6798 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6801 0ebf8283 2019-07-24 stsp goto done;
6803 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6805 0ebf8283 2019-07-24 stsp goto done;
6807 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6809 0ebf8283 2019-07-24 stsp goto done;
6811 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6812 0ebf8283 2019-07-24 stsp worktree);
6814 0ebf8283 2019-07-24 stsp goto done;
6816 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6819 0ebf8283 2019-07-24 stsp goto done;
6821 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6823 0ebf8283 2019-07-24 stsp goto done;
6825 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6827 0ebf8283 2019-07-24 stsp goto done;
6829 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6830 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6832 0ebf8283 2019-07-24 stsp goto done;
6833 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6835 0ebf8283 2019-07-24 stsp goto done;
6836 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6837 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6838 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6839 0ebf8283 2019-07-24 stsp goto done;
6842 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6843 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6845 0ebf8283 2019-07-24 stsp goto done;
6846 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6848 0ebf8283 2019-07-24 stsp goto done;
6850 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6852 0ebf8283 2019-07-24 stsp goto done;
6854 0ebf8283 2019-07-24 stsp free(fileindex_path);
6855 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6856 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6857 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6858 0ebf8283 2019-07-24 stsp if (wt_branch)
6859 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6860 0ebf8283 2019-07-24 stsp if (err) {
6861 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6862 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6863 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6865 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6866 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6867 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6869 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6870 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6871 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6872 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6874 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6876 0ebf8283 2019-07-24 stsp return err;
6879 0ebf8283 2019-07-24 stsp const struct got_error *
6880 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6881 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6883 3e3a69f1 2019-07-25 stsp if (fileindex)
6884 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6885 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6888 0ebf8283 2019-07-24 stsp const struct got_error *
6889 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6890 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6892 0ebf8283 2019-07-24 stsp const struct got_error *err;
6893 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6895 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6897 0ebf8283 2019-07-24 stsp return err;
6899 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6900 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6901 0ebf8283 2019-07-24 stsp return NULL;
6904 0ebf8283 2019-07-24 stsp const struct got_error *
6905 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6906 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6907 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6908 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6910 0ebf8283 2019-07-24 stsp const struct got_error *err;
6911 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6912 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6913 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6914 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6915 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6916 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6918 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6919 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6920 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6921 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6923 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6925 3e3a69f1 2019-07-25 stsp return err;
6927 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6929 f032f1f7 2019-08-04 stsp goto done;
6931 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6932 f032f1f7 2019-08-04 stsp &have_staged_files);
6933 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6934 f032f1f7 2019-08-04 stsp goto done;
6935 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6936 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6937 3e3a69f1 2019-07-25 stsp goto done;
6940 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6942 f032f1f7 2019-08-04 stsp goto done;
6944 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6946 0ebf8283 2019-07-24 stsp goto done;
6948 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6950 0ebf8283 2019-07-24 stsp goto done;
6952 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6953 0ebf8283 2019-07-24 stsp worktree);
6955 0ebf8283 2019-07-24 stsp goto done;
6957 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6959 0ebf8283 2019-07-24 stsp goto done;
6961 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6963 0ebf8283 2019-07-24 stsp goto done;
6964 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6966 0ebf8283 2019-07-24 stsp goto done;
6968 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6970 0ebf8283 2019-07-24 stsp goto done;
6971 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6973 0ebf8283 2019-07-24 stsp goto done;
6975 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6977 0ebf8283 2019-07-24 stsp goto done;
6979 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6980 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6981 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6982 0ebf8283 2019-07-24 stsp if (commit_ref)
6983 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6984 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6985 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6986 0ebf8283 2019-07-24 stsp if (err) {
6987 0ebf8283 2019-07-24 stsp free(*commit_id);
6988 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6989 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6990 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6991 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6992 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6993 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6995 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6996 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6997 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6999 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7001 0ebf8283 2019-07-24 stsp return err;
7004 0ebf8283 2019-07-24 stsp static const struct got_error *
7005 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7007 0ebf8283 2019-07-24 stsp const struct got_error *err;
7008 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7009 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7011 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7013 0ebf8283 2019-07-24 stsp goto done;
7014 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7016 0ebf8283 2019-07-24 stsp goto done;
7018 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7019 0ebf8283 2019-07-24 stsp worktree);
7021 0ebf8283 2019-07-24 stsp goto done;
7022 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7024 0ebf8283 2019-07-24 stsp goto done;
7026 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7028 0ebf8283 2019-07-24 stsp goto done;
7029 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7031 0ebf8283 2019-07-24 stsp goto done;
7033 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7035 0ebf8283 2019-07-24 stsp goto done;
7036 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7038 0ebf8283 2019-07-24 stsp goto done;
7040 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7041 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7042 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7043 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7044 0ebf8283 2019-07-24 stsp return err;
7047 0ebf8283 2019-07-24 stsp const struct got_error *
7048 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7049 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7050 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7051 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7053 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7054 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7055 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7056 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7057 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7059 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7061 0ebf8283 2019-07-24 stsp return err;
7063 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7064 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7066 0ebf8283 2019-07-24 stsp goto done;
7068 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7070 0ebf8283 2019-07-24 stsp goto done;
7072 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7074 0ebf8283 2019-07-24 stsp goto done;
7076 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7077 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7079 0ebf8283 2019-07-24 stsp goto done;
7081 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7083 0ebf8283 2019-07-24 stsp goto done;
7085 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7087 0ebf8283 2019-07-24 stsp goto done;
7089 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7090 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7091 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7092 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7093 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7094 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7095 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7096 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
7097 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7098 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7100 1f1abb7e 2019-08-08 stsp goto sync;
7102 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7103 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7105 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7106 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7107 0ebf8283 2019-07-24 stsp err = sync_err;
7109 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7110 0ebf8283 2019-07-24 stsp free(tree_id);
7111 818c7501 2019-07-11 stsp free(fileindex_path);
7113 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7114 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7115 818c7501 2019-07-11 stsp err = unlockerr;
7116 818c7501 2019-07-11 stsp return err;
7119 0ebf8283 2019-07-24 stsp const struct got_error *
7120 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7121 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7122 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7124 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7125 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7126 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7127 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7129 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7131 0ebf8283 2019-07-24 stsp return err;
7133 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7134 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7136 e600f124 2021-03-21 stsp goto done;
7138 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7139 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7141 0ebf8283 2019-07-24 stsp goto done;
7143 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7145 0ebf8283 2019-07-24 stsp goto done;
7147 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7149 0ebf8283 2019-07-24 stsp goto done;
7151 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7153 0ebf8283 2019-07-24 stsp goto done;
7155 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7157 a615e0e7 2020-12-16 stsp goto done;
7159 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7161 a615e0e7 2020-12-16 stsp goto done;
7162 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7163 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7164 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7165 a615e0e7 2020-12-16 stsp err = sync_err;
7167 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7168 a615e0e7 2020-12-16 stsp free(fileindex_path);
7169 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7170 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7171 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7172 0ebf8283 2019-07-24 stsp err = unlockerr;
7173 0ebf8283 2019-07-24 stsp return err;
7176 0ebf8283 2019-07-24 stsp const struct got_error *
7177 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7178 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7180 0ebf8283 2019-07-24 stsp const struct got_error *err;
7181 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7183 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7185 0ebf8283 2019-07-24 stsp return err;
7187 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7189 0ebf8283 2019-07-24 stsp goto done;
7191 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7193 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7194 2822a352 2019-10-15 stsp return err;
7197 2822a352 2019-10-15 stsp const struct got_error *
7198 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7199 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7200 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7201 2822a352 2019-10-15 stsp struct got_repository *repo)
7203 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7204 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7205 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7207 2822a352 2019-10-15 stsp *fileindex = NULL;
7208 2822a352 2019-10-15 stsp *branch_ref = NULL;
7209 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7211 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7213 2822a352 2019-10-15 stsp return err;
7215 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7216 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7217 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7218 2822a352 2019-10-15 stsp "update -b or different branch name required");
7219 2822a352 2019-10-15 stsp goto done;
7222 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7224 2822a352 2019-10-15 stsp goto done;
7226 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7227 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7228 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7229 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7232 2822a352 2019-10-15 stsp goto done;
7234 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7236 2822a352 2019-10-15 stsp goto done;
7238 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7239 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7241 2822a352 2019-10-15 stsp if (err) {
7242 2822a352 2019-10-15 stsp if (*branch_ref) {
7243 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7244 2822a352 2019-10-15 stsp *branch_ref = NULL;
7246 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7247 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7248 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7250 2822a352 2019-10-15 stsp if (*fileindex) {
7251 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7252 2822a352 2019-10-15 stsp *fileindex = NULL;
7254 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7256 0cb83759 2019-08-03 stsp return err;
7259 2822a352 2019-10-15 stsp const struct got_error *
7260 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7261 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7262 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7263 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7264 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7266 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7267 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7268 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7270 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7272 2822a352 2019-10-15 stsp goto done;
7274 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7276 2822a352 2019-10-15 stsp goto done;
7278 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7279 2822a352 2019-10-15 stsp worktree->path_prefix);
7281 2822a352 2019-10-15 stsp goto done;
7283 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7285 2822a352 2019-10-15 stsp goto done;
7287 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7288 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7290 2822a352 2019-10-15 stsp goto sync;
7292 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7294 2822a352 2019-10-15 stsp goto sync;
7296 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7298 6e210706 2021-01-22 stsp goto sync;
7300 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7302 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7303 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7304 2822a352 2019-10-15 stsp err = sync_err;
7307 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7308 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7309 2822a352 2019-10-15 stsp err = unlockerr;
7310 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7312 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7313 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7314 2822a352 2019-10-15 stsp err = unlockerr;
7315 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7317 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7318 2822a352 2019-10-15 stsp free(fileindex_path);
7319 2822a352 2019-10-15 stsp free(tree_id);
7321 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7322 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7323 2822a352 2019-10-15 stsp err = unlockerr;
7324 2822a352 2019-10-15 stsp return err;
7327 2822a352 2019-10-15 stsp const struct got_error *
7328 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7329 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7330 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7332 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7334 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7336 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7338 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7339 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7340 8b692cd0 2019-10-21 stsp err = unlockerr;
7341 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7343 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7344 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7345 8b692cd0 2019-10-21 stsp err = unlockerr;
7346 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7348 10604dce 2021-09-24 thomas return err;
7351 10604dce 2021-09-24 thomas const struct got_error *
7352 10604dce 2021-09-24 thomas got_worktree_merge_postpone(struct got_worktree *worktree,
7353 10604dce 2021-09-24 thomas struct got_fileindex *fileindex)
7355 10604dce 2021-09-24 thomas const struct got_error *err, *sync_err;
7356 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7358 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7359 10604dce 2021-09-24 thomas if (err)
7360 10604dce 2021-09-24 thomas goto done;
7362 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7364 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_SH);
7365 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7366 10604dce 2021-09-24 thomas err = sync_err;
7368 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7369 10604dce 2021-09-24 thomas free(fileindex_path);
7370 8b692cd0 2019-10-21 stsp return err;
7373 10604dce 2021-09-24 thomas static const struct got_error *
7374 10604dce 2021-09-24 thomas delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7376 10604dce 2021-09-24 thomas const struct got_error *err;
7377 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7379 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7380 10604dce 2021-09-24 thomas if (err)
7381 10604dce 2021-09-24 thomas goto done;
7382 10604dce 2021-09-24 thomas err = delete_ref(branch_refname, repo);
7383 10604dce 2021-09-24 thomas if (err)
7384 10604dce 2021-09-24 thomas goto done;
7386 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7387 10604dce 2021-09-24 thomas if (err)
7388 10604dce 2021-09-24 thomas goto done;
7389 10604dce 2021-09-24 thomas err = delete_ref(commit_refname, repo);
7390 10604dce 2021-09-24 thomas if (err)
7391 10604dce 2021-09-24 thomas goto done;
7394 10604dce 2021-09-24 thomas free(branch_refname);
7395 10604dce 2021-09-24 thomas free(commit_refname);
7396 10604dce 2021-09-24 thomas return err;
7399 10604dce 2021-09-24 thomas struct merge_commit_msg_arg {
7400 10604dce 2021-09-24 thomas struct got_worktree *worktree;
7401 10604dce 2021-09-24 thomas const char *branch_name;
7404 10604dce 2021-09-24 thomas static const struct got_error *
7405 10604dce 2021-09-24 thomas merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7406 10604dce 2021-09-24 thomas void *arg)
7408 10604dce 2021-09-24 thomas struct merge_commit_msg_arg *a = arg;
7410 10604dce 2021-09-24 thomas if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7411 10604dce 2021-09-24 thomas got_worktree_get_head_ref_name(a->worktree)) == -1)
7412 10604dce 2021-09-24 thomas return got_error_from_errno("asprintf");
7414 10604dce 2021-09-24 thomas return NULL;
7418 10604dce 2021-09-24 thomas const struct got_error *
7419 10604dce 2021-09-24 thomas got_worktree_merge_branch(struct got_worktree *worktree,
7420 10604dce 2021-09-24 thomas struct got_fileindex *fileindex,
7421 10604dce 2021-09-24 thomas struct got_object_id *yca_commit_id,
7422 10604dce 2021-09-24 thomas struct got_object_id *branch_tip,
7423 10604dce 2021-09-24 thomas struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7424 10604dce 2021-09-24 thomas void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7426 10604dce 2021-09-24 thomas const struct got_error *err;
7427 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7429 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7430 10604dce 2021-09-24 thomas if (err)
7431 10604dce 2021-09-24 thomas goto done;
7433 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7434 10604dce 2021-09-24 thomas worktree);
7435 10604dce 2021-09-24 thomas if (err)
7436 10604dce 2021-09-24 thomas goto done;
7438 10604dce 2021-09-24 thomas err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7439 10604dce 2021-09-24 thomas branch_tip, repo, progress_cb, progress_arg,
7440 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
7442 10604dce 2021-09-24 thomas free(fileindex_path);
7443 10604dce 2021-09-24 thomas return err;
7446 10604dce 2021-09-24 thomas const struct got_error *
7447 10604dce 2021-09-24 thomas got_worktree_merge_commit(struct got_object_id **new_commit_id,
7448 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
7449 10604dce 2021-09-24 thomas const char *author, const char *committer, int allow_bad_symlinks,
7450 10604dce 2021-09-24 thomas struct got_object_id *branch_tip, const char *branch_name,
7451 ae1e948a 2021-09-28 thomas struct got_repository *repo,
7452 ae1e948a 2021-09-28 thomas got_worktree_status_cb status_cb, void *status_arg)
7455 10604dce 2021-09-24 thomas const struct got_error *err = NULL, *sync_err;
7456 10604dce 2021-09-24 thomas struct got_pathlist_head commitable_paths;
7457 10604dce 2021-09-24 thomas struct collect_commitables_arg cc_arg;
7458 10604dce 2021-09-24 thomas struct got_pathlist_entry *pe;
7459 10604dce 2021-09-24 thomas struct got_reference *head_ref = NULL;
7460 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id = NULL;
7461 10604dce 2021-09-24 thomas int have_staged_files = 0;
7462 10604dce 2021-09-24 thomas struct merge_commit_msg_arg mcm_arg;
7463 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7465 10604dce 2021-09-24 thomas *new_commit_id = NULL;
7467 10604dce 2021-09-24 thomas TAILQ_INIT(&commitable_paths);
7469 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7470 10604dce 2021-09-24 thomas if (err)
7471 10604dce 2021-09-24 thomas goto done;
7473 10604dce 2021-09-24 thomas err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7474 10604dce 2021-09-24 thomas if (err)
7475 10604dce 2021-09-24 thomas goto done;
7477 10604dce 2021-09-24 thomas err = got_ref_resolve(&head_commit_id, repo, head_ref);
7478 10604dce 2021-09-24 thomas if (err)
7479 10604dce 2021-09-24 thomas goto done;
7481 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7482 10604dce 2021-09-24 thomas &have_staged_files);
7483 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7484 10604dce 2021-09-24 thomas goto done;
7485 10604dce 2021-09-24 thomas if (have_staged_files) {
7486 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7487 10604dce 2021-09-24 thomas goto done;
7490 10604dce 2021-09-24 thomas cc_arg.commitable_paths = &commitable_paths;
7491 10604dce 2021-09-24 thomas cc_arg.worktree = worktree;
7492 10604dce 2021-09-24 thomas cc_arg.fileindex = fileindex;
7493 10604dce 2021-09-24 thomas cc_arg.repo = repo;
7494 10604dce 2021-09-24 thomas cc_arg.have_staged_files = have_staged_files;
7495 10604dce 2021-09-24 thomas cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7496 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7497 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7498 10604dce 2021-09-24 thomas if (err)
7499 10604dce 2021-09-24 thomas goto done;
7501 10604dce 2021-09-24 thomas if (TAILQ_EMPTY(&commitable_paths)) {
7502 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7503 10604dce 2021-09-24 thomas "merge of %s cannot proceed", branch_name);
7504 10604dce 2021-09-24 thomas goto done;
7507 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7508 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7509 10604dce 2021-09-24 thomas const char *ct_path = ct->in_repo_path;
7511 10604dce 2021-09-24 thomas while (ct_path[0] == '/')
7512 10604dce 2021-09-24 thomas ct_path++;
7513 10604dce 2021-09-24 thomas err = check_out_of_date(ct_path, ct->status,
7514 10604dce 2021-09-24 thomas ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7515 10604dce 2021-09-24 thomas head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7516 10604dce 2021-09-24 thomas if (err)
7517 10604dce 2021-09-24 thomas goto done;
7521 10604dce 2021-09-24 thomas mcm_arg.worktree = worktree;
7522 10604dce 2021-09-24 thomas mcm_arg.branch_name = branch_name;
7523 10604dce 2021-09-24 thomas err = commit_worktree(new_commit_id, &commitable_paths,
7524 10604dce 2021-09-24 thomas head_commit_id, branch_tip, worktree, author, committer,
7525 ae1e948a 2021-09-28 thomas merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7526 10604dce 2021-09-24 thomas if (err)
7527 10604dce 2021-09-24 thomas goto done;
7529 10604dce 2021-09-24 thomas err = update_fileindex_after_commit(worktree, &commitable_paths,
7530 10604dce 2021-09-24 thomas *new_commit_id, fileindex, have_staged_files);
7531 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7532 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7533 10604dce 2021-09-24 thomas err = sync_err;
7535 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7536 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7537 10604dce 2021-09-24 thomas free_commitable(ct);
7539 10604dce 2021-09-24 thomas got_pathlist_free(&commitable_paths);
7540 10604dce 2021-09-24 thomas free(fileindex_path);
7541 10604dce 2021-09-24 thomas return err;
7544 10604dce 2021-09-24 thomas const struct got_error *
7545 10604dce 2021-09-24 thomas got_worktree_merge_complete(struct got_worktree *worktree,
7546 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo)
7548 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7549 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7551 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7552 10604dce 2021-09-24 thomas if (err)
7553 10604dce 2021-09-24 thomas goto done;
7555 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7556 10604dce 2021-09-24 thomas if (err)
7557 10604dce 2021-09-24 thomas goto done;
7558 10604dce 2021-09-24 thomas err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7559 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7560 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7561 10604dce 2021-09-24 thomas err = sync_err;
7563 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7564 10604dce 2021-09-24 thomas free(fileindex_path);
7565 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7566 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7567 10604dce 2021-09-24 thomas err = unlockerr;
7568 10604dce 2021-09-24 thomas return err;
7571 10604dce 2021-09-24 thomas const struct got_error *
7572 10604dce 2021-09-24 thomas got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7573 10604dce 2021-09-24 thomas struct got_repository *repo)
7575 10604dce 2021-09-24 thomas const struct got_error *err;
7576 10604dce 2021-09-24 thomas char *branch_refname = NULL;
7577 10604dce 2021-09-24 thomas struct got_reference *branch_ref = NULL;
7579 10604dce 2021-09-24 thomas *in_progress = 0;
7581 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7582 10604dce 2021-09-24 thomas if (err)
7583 10604dce 2021-09-24 thomas return err;
7584 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7585 dfe86d1f 2021-09-24 thomas free(branch_refname);
7586 10604dce 2021-09-24 thomas if (err) {
7587 10604dce 2021-09-24 thomas if (err->code != GOT_ERR_NOT_REF)
7588 10604dce 2021-09-24 thomas return err;
7590 10604dce 2021-09-24 thomas *in_progress = 1;
7592 10604dce 2021-09-24 thomas return NULL;
7595 10604dce 2021-09-24 thomas const struct got_error *got_worktree_merge_prepare(
7596 10604dce 2021-09-24 thomas struct got_fileindex **fileindex, struct got_worktree *worktree,
7597 10604dce 2021-09-24 thomas struct got_reference *branch, struct got_repository *repo)
7599 10604dce 2021-09-24 thomas const struct got_error *err = NULL;
7600 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7601 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7602 10604dce 2021-09-24 thomas struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7603 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL;
7604 10604dce 2021-09-24 thomas struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7605 10604dce 2021-09-24 thomas struct check_rebase_ok_arg ok_arg;
7607 10604dce 2021-09-24 thomas *fileindex = NULL;
7609 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
7610 10604dce 2021-09-24 thomas if (err)
7611 10604dce 2021-09-24 thomas return err;
7613 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
7614 10604dce 2021-09-24 thomas if (err)
7615 10604dce 2021-09-24 thomas goto done;
7617 10604dce 2021-09-24 thomas /* Preconditions are the same as for rebase. */
7618 10604dce 2021-09-24 thomas ok_arg.worktree = worktree;
7619 10604dce 2021-09-24 thomas ok_arg.repo = repo;
7620 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7621 10604dce 2021-09-24 thomas &ok_arg);
7622 10604dce 2021-09-24 thomas if (err)
7623 10604dce 2021-09-24 thomas goto done;
7625 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7626 10604dce 2021-09-24 thomas if (err)
7627 10604dce 2021-09-24 thomas return err;
7629 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7630 10604dce 2021-09-24 thomas if (err)
7631 10604dce 2021-09-24 thomas return err;
7633 10604dce 2021-09-24 thomas err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7635 10604dce 2021-09-24 thomas if (err)
7636 10604dce 2021-09-24 thomas goto done;
7638 10604dce 2021-09-24 thomas err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7639 10604dce 2021-09-24 thomas if (err)
7640 10604dce 2021-09-24 thomas goto done;
7642 10604dce 2021-09-24 thomas if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7643 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7644 10604dce 2021-09-24 thomas goto done;
7647 10604dce 2021-09-24 thomas err = got_ref_resolve(&branch_tip, repo, branch);
7648 10604dce 2021-09-24 thomas if (err)
7649 10604dce 2021-09-24 thomas goto done;
7651 10604dce 2021-09-24 thomas err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7652 10604dce 2021-09-24 thomas if (err)
7653 10604dce 2021-09-24 thomas goto done;
7654 10604dce 2021-09-24 thomas err = got_ref_write(branch_ref, repo);
7655 10604dce 2021-09-24 thomas if (err)
7656 10604dce 2021-09-24 thomas goto done;
7658 10604dce 2021-09-24 thomas err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7659 10604dce 2021-09-24 thomas if (err)
7660 10604dce 2021-09-24 thomas goto done;
7661 10604dce 2021-09-24 thomas err = got_ref_write(commit_ref, repo);
7662 10604dce 2021-09-24 thomas if (err)
7663 10604dce 2021-09-24 thomas goto done;
7666 10604dce 2021-09-24 thomas free(branch_refname);
7667 10604dce 2021-09-24 thomas free(commit_refname);
7668 10604dce 2021-09-24 thomas free(fileindex_path);
7669 10604dce 2021-09-24 thomas if (branch_ref)
7670 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
7671 10604dce 2021-09-24 thomas if (commit_ref)
7672 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
7673 10604dce 2021-09-24 thomas if (wt_branch)
7674 10604dce 2021-09-24 thomas got_ref_close(wt_branch);
7675 10604dce 2021-09-24 thomas free(wt_branch_tip);
7676 10604dce 2021-09-24 thomas if (err) {
7677 10604dce 2021-09-24 thomas if (*fileindex) {
7678 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
7679 10604dce 2021-09-24 thomas *fileindex = NULL;
7681 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
7683 10604dce 2021-09-24 thomas return err;
7686 10604dce 2021-09-24 thomas const struct got_error *
7687 10604dce 2021-09-24 thomas got_worktree_merge_continue(char **branch_name,
7688 10604dce 2021-09-24 thomas struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7689 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_repository *repo)
7691 10604dce 2021-09-24 thomas const struct got_error *err;
7692 10604dce 2021-09-24 thomas char *commit_refname = NULL, *branch_refname = NULL;
7693 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7694 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7695 10604dce 2021-09-24 thomas int have_staged_files = 0;
7697 10604dce 2021-09-24 thomas *branch_name = NULL;
7698 10604dce 2021-09-24 thomas *branch_tip = NULL;
7699 10604dce 2021-09-24 thomas *fileindex = NULL;
7701 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
7702 10604dce 2021-09-24 thomas if (err)
7703 10604dce 2021-09-24 thomas return err;
7705 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
7706 10604dce 2021-09-24 thomas if (err)
7707 10604dce 2021-09-24 thomas goto done;
7709 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7710 10604dce 2021-09-24 thomas &have_staged_files);
7711 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7712 10604dce 2021-09-24 thomas goto done;
7713 10604dce 2021-09-24 thomas if (have_staged_files) {
7714 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_STAGED_PATHS);
7715 10604dce 2021-09-24 thomas goto done;
7718 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7719 10604dce 2021-09-24 thomas if (err)
7720 10604dce 2021-09-24 thomas goto done;
7722 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7723 10604dce 2021-09-24 thomas if (err)
7724 10604dce 2021-09-24 thomas goto done;
7726 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7727 10604dce 2021-09-24 thomas if (err)
7728 10604dce 2021-09-24 thomas goto done;
7730 10604dce 2021-09-24 thomas if (!got_ref_is_symbolic(branch_ref)) {
7731 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7732 10604dce 2021-09-24 thomas "%s is not a symbolic reference",
7733 10604dce 2021-09-24 thomas got_ref_get_name(branch_ref));
7734 10604dce 2021-09-24 thomas goto done;
7736 10604dce 2021-09-24 thomas *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7737 10604dce 2021-09-24 thomas if (*branch_name == NULL) {
7738 10604dce 2021-09-24 thomas err = got_error_from_errno("strdup");
7739 10604dce 2021-09-24 thomas goto done;
7742 10604dce 2021-09-24 thomas err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7743 10604dce 2021-09-24 thomas if (err)
7744 10604dce 2021-09-24 thomas goto done;
7746 10604dce 2021-09-24 thomas err = got_ref_resolve(branch_tip, repo, commit_ref);
7747 10604dce 2021-09-24 thomas if (err)
7748 10604dce 2021-09-24 thomas goto done;
7750 10604dce 2021-09-24 thomas free(commit_refname);
7751 10604dce 2021-09-24 thomas free(branch_refname);
7752 10604dce 2021-09-24 thomas free(fileindex_path);
7753 10604dce 2021-09-24 thomas if (commit_ref)
7754 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
7755 10604dce 2021-09-24 thomas if (branch_ref)
7756 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
7757 10604dce 2021-09-24 thomas if (err) {
7758 10604dce 2021-09-24 thomas if (*branch_name) {
7759 10604dce 2021-09-24 thomas free(*branch_name);
7760 10604dce 2021-09-24 thomas *branch_name = NULL;
7762 10604dce 2021-09-24 thomas free(*branch_tip);
7763 10604dce 2021-09-24 thomas *branch_tip = NULL;
7764 10604dce 2021-09-24 thomas if (*fileindex) {
7765 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
7766 10604dce 2021-09-24 thomas *fileindex = NULL;
7768 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
7770 10604dce 2021-09-24 thomas return err;
7773 10604dce 2021-09-24 thomas const struct got_error *
7774 10604dce 2021-09-24 thomas got_worktree_merge_abort(struct got_worktree *worktree,
7775 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo,
7776 10604dce 2021-09-24 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
7778 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7779 10604dce 2021-09-24 thomas struct got_object_id *commit_id = NULL;
7780 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7781 10604dce 2021-09-24 thomas struct revert_file_args rfa;
7782 10604dce 2021-09-24 thomas struct got_object_id *tree_id = NULL;
7784 10604dce 2021-09-24 thomas err = got_object_id_by_path(&tree_id, repo,
7785 10604dce 2021-09-24 thomas worktree->base_commit_id, worktree->path_prefix);
7786 10604dce 2021-09-24 thomas if (err)
7787 10604dce 2021-09-24 thomas goto done;
7789 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7790 10604dce 2021-09-24 thomas if (err)
7791 10604dce 2021-09-24 thomas goto done;
7793 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7794 10604dce 2021-09-24 thomas if (err)
7795 10604dce 2021-09-24 thomas goto done;
7797 10604dce 2021-09-24 thomas rfa.worktree = worktree;
7798 10604dce 2021-09-24 thomas rfa.fileindex = fileindex;
7799 10604dce 2021-09-24 thomas rfa.progress_cb = progress_cb;
7800 10604dce 2021-09-24 thomas rfa.progress_arg = progress_arg;
7801 10604dce 2021-09-24 thomas rfa.patch_cb = NULL;
7802 10604dce 2021-09-24 thomas rfa.patch_arg = NULL;
7803 10604dce 2021-09-24 thomas rfa.repo = repo;
7804 10604dce 2021-09-24 thomas rfa.unlink_added_files = 1;
7805 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7806 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7807 10604dce 2021-09-24 thomas if (err)
7808 10604dce 2021-09-24 thomas goto sync;
7810 10604dce 2021-09-24 thomas err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7811 10604dce 2021-09-24 thomas repo, progress_cb, progress_arg, NULL, NULL);
7813 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7814 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7815 10604dce 2021-09-24 thomas err = sync_err;
7817 10604dce 2021-09-24 thomas free(tree_id);
7818 10604dce 2021-09-24 thomas free(commit_id);
7819 10604dce 2021-09-24 thomas if (fileindex)
7820 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7821 10604dce 2021-09-24 thomas free(fileindex_path);
7823 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7824 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7825 10604dce 2021-09-24 thomas err = unlockerr;
7826 10604dce 2021-09-24 thomas return err;
7829 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7830 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7831 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7832 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7833 2db2652d 2019-08-07 stsp struct got_repository *repo;
7834 2db2652d 2019-08-07 stsp int have_changes;
7837 2db2652d 2019-08-07 stsp const struct got_error *
7838 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7839 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7840 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7841 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7843 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7844 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7845 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7846 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7847 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7848 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7850 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7851 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7852 8b13ce36 2019-08-08 stsp return NULL;
7853 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7854 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7856 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7857 735ef5ac 2019-08-03 stsp if (ie == NULL)
7858 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7860 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7861 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7862 735ef5ac 2019-08-03 stsp relpath) == -1)
7863 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7865 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7866 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7867 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7868 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7871 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7872 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7873 3aa5969e 2019-08-06 stsp goto done;
7874 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7875 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7876 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7877 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7878 735ef5ac 2019-08-03 stsp goto done;
7881 2db2652d 2019-08-07 stsp a->have_changes = 1;
7883 735ef5ac 2019-08-03 stsp p = in_repo_path;
7884 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7886 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7887 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7888 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7890 735ef5ac 2019-08-03 stsp free(in_repo_path);
7891 dc424a06 2019-08-07 stsp return err;
7894 2db2652d 2019-08-07 stsp struct stage_path_arg {
7895 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7896 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7897 2db2652d 2019-08-07 stsp struct got_repository *repo;
7898 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7899 2db2652d 2019-08-07 stsp void *status_arg;
7900 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7901 2db2652d 2019-08-07 stsp void *patch_arg;
7902 7b5dc508 2019-10-28 stsp int staged_something;
7903 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7906 2db2652d 2019-08-07 stsp static const struct got_error *
7907 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7908 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7909 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7910 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7912 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7913 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7914 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7915 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7916 0cb83759 2019-08-03 stsp uint32_t stage;
7917 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7918 0aeb8099 2020-07-23 stsp struct stat sb;
7920 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7921 8b13ce36 2019-08-08 stsp return NULL;
7923 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7924 d3e7c587 2019-08-03 stsp if (ie == NULL)
7925 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7927 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7928 2db2652d 2019-08-07 stsp relpath)== -1)
7929 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7931 0cb83759 2019-08-03 stsp switch (status) {
7932 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7933 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7934 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7935 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7936 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7939 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7940 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7941 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7942 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7943 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7946 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7949 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7950 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7951 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7952 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7953 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7957 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7958 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7961 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7962 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7963 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7964 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7966 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7967 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7968 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7969 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7970 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7971 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7972 35213c7c 2020-07-23 stsp ssize_t target_len;
7973 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7974 35213c7c 2020-07-23 stsp sizeof(target_path));
7975 35213c7c 2020-07-23 stsp if (target_len == -1) {
7976 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7977 35213c7c 2020-07-23 stsp ondisk_path);
7980 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7981 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7982 35213c7c 2020-07-23 stsp a->worktree->root_path);
7985 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7986 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7987 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7991 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7992 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7993 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7995 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7996 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7998 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7999 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8001 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8002 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8004 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8005 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8006 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8008 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8009 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8011 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8012 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8013 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8014 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8017 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8019 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8020 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8024 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8025 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8026 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8027 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8029 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8030 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8033 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8035 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8036 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8038 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8039 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8042 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8046 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8047 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8048 dc424a06 2019-08-07 stsp free(path_content);
8049 2db2652d 2019-08-07 stsp free(ondisk_path);
8050 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8051 0ebf8283 2019-07-24 stsp return err;
8054 0cb83759 2019-08-03 stsp const struct got_error *
8055 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8056 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8057 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8058 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8059 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8061 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8062 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8063 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8064 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8065 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8066 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8067 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8068 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8070 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8072 0cb83759 2019-08-03 stsp return err;
8074 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8075 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8077 735ef5ac 2019-08-03 stsp goto done;
8078 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8080 735ef5ac 2019-08-03 stsp goto done;
8081 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8083 0cb83759 2019-08-03 stsp goto done;
8085 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8086 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8087 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8088 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8089 2db2652d 2019-08-07 stsp oka.repo = repo;
8090 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8091 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8092 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8093 6092c299 2021-10-04 thomas check_stage_ok, &oka, NULL, NULL, 1, 0);
8095 735ef5ac 2019-08-03 stsp goto done;
8097 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8098 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8099 2db2652d 2019-08-07 stsp goto done;
8102 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8103 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8104 2db2652d 2019-08-07 stsp spa.repo = repo;
8105 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8106 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8107 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8108 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8109 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8110 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8111 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8112 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8113 6092c299 2021-10-04 thomas stage_path, &spa, NULL, NULL, 1, 0);
8115 2db2652d 2019-08-07 stsp goto done;
8117 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8118 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8119 7b5dc508 2019-10-28 stsp goto done;
8122 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8123 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8124 0cb83759 2019-08-03 stsp err = sync_err;
8126 735ef5ac 2019-08-03 stsp if (head_ref)
8127 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8128 735ef5ac 2019-08-03 stsp free(head_commit_id);
8129 0cb83759 2019-08-03 stsp free(fileindex_path);
8130 0cb83759 2019-08-03 stsp if (fileindex)
8131 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8132 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8133 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8134 0cb83759 2019-08-03 stsp err = unlockerr;
8135 0cb83759 2019-08-03 stsp return err;
8138 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8139 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8140 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8141 ad493afc 2019-08-03 stsp struct got_repository *repo;
8142 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8143 ad493afc 2019-08-03 stsp void *progress_arg;
8144 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8145 2e1f37b0 2019-08-08 stsp void *patch_arg;
8148 2e1f37b0 2019-08-08 stsp static const struct got_error *
8149 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8150 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8151 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8152 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8153 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8155 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8156 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8157 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8158 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8159 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8160 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8161 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8163 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8164 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8166 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8168 2e1f37b0 2019-08-08 stsp return err;
8169 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8171 2e1f37b0 2019-08-08 stsp goto done;
8173 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8175 2e1f37b0 2019-08-08 stsp goto done;
8177 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8179 2e1f37b0 2019-08-08 stsp goto done;
8181 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8183 2e1f37b0 2019-08-08 stsp goto done;
8185 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8187 2e1f37b0 2019-08-08 stsp goto done;
8189 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8191 2e1f37b0 2019-08-08 stsp goto done;
8193 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8194 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8196 2e1f37b0 2019-08-08 stsp goto done;
8198 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8199 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8201 2e1f37b0 2019-08-08 stsp goto done;
8202 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8203 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8205 2e1f37b0 2019-08-08 stsp goto done;
8207 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8208 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8209 2e1f37b0 2019-08-08 stsp goto done;
8211 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8212 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8213 2e1f37b0 2019-08-08 stsp goto done;
8215 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8216 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8217 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
8218 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8219 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8220 fe621944 2020-11-10 stsp nchanges++;
8222 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8223 2e1f37b0 2019-08-08 stsp int choice;
8224 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8225 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8226 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8227 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8229 2e1f37b0 2019-08-08 stsp goto done;
8230 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8231 2e1f37b0 2019-08-08 stsp have_content = 1;
8233 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8234 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8237 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8238 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8239 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8241 2e1f37b0 2019-08-08 stsp free(label1);
8243 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8244 2e1f37b0 2019-08-08 stsp if (staged_blob)
8245 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8246 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8247 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8248 fe621944 2020-11-10 stsp err = free_err;
8249 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8250 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8251 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8252 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8253 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8254 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8255 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8256 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8257 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8258 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8259 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8260 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8261 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8262 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8263 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8264 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8265 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8266 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8267 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8269 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8270 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8271 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8272 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8273 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8274 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8275 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8277 2e1f37b0 2019-08-08 stsp free(path1);
8278 2e1f37b0 2019-08-08 stsp free(path2);
8279 fda8017d 2020-07-23 stsp return err;
8282 fda8017d 2020-07-23 stsp static const struct got_error *
8283 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8284 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8285 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8286 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8287 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8288 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8289 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8291 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8292 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8293 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8294 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8295 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8296 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8297 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8298 fda8017d 2020-07-23 stsp struct stat sb;
8300 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8301 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8302 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8304 fda8017d 2020-07-23 stsp return err;
8306 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8307 fda8017d 2020-07-23 stsp return NULL;
8309 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8310 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8311 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8313 fda8017d 2020-07-23 stsp goto done;
8316 c56c5d8a 2021-12-31 thomas f = fopen(path_unstaged_content, "re");
8317 fda8017d 2020-07-23 stsp if (f == NULL) {
8318 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8319 fda8017d 2020-07-23 stsp path_unstaged_content);
8320 fda8017d 2020-07-23 stsp goto done;
8322 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8323 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8324 fda8017d 2020-07-23 stsp goto done;
8326 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8327 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8328 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8330 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8331 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8332 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8333 fda8017d 2020-07-23 stsp goto done;
8335 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8336 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8337 fda8017d 2020-07-23 stsp goto done;
8339 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8340 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8341 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8342 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8343 fda8017d 2020-07-23 stsp progress_arg);
8345 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8347 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8349 67a66647 2021-05-31 stsp return err;
8351 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8352 67a66647 2021-05-31 stsp parent) == -1) {
8353 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8354 67a66647 2021-05-31 stsp base_path = NULL;
8355 67a66647 2021-05-31 stsp goto done;
8358 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8360 67a66647 2021-05-31 stsp goto done;
8361 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8362 67a66647 2021-05-31 stsp blob_base);
8364 67a66647 2021-05-31 stsp goto done;
8367 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8368 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8370 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8371 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8372 eec2f5a9 2021-06-03 stsp ondisk_path);
8374 eec2f5a9 2021-06-03 stsp goto done;
8377 06340621 2021-12-31 thomas fd = open(ondisk_path,
8378 06340621 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8379 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8380 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8381 eec2f5a9 2021-06-03 stsp goto done;
8383 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8384 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8385 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8386 eec2f5a9 2021-06-03 stsp close(fd);
8387 eec2f5a9 2021-06-03 stsp goto done;
8391 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8392 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8393 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8394 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8395 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8398 fda8017d 2020-07-23 stsp goto done;
8400 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8401 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8402 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8404 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8405 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8408 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8409 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8410 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8411 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8412 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8413 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8414 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8415 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8416 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8417 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8418 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8419 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8420 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8421 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8422 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8423 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8424 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8425 67a66647 2021-05-31 stsp free(blob_base_path);
8426 67a66647 2021-05-31 stsp free(parent);
8427 67a66647 2021-05-31 stsp free(base_path);
8428 2e1f37b0 2019-08-08 stsp return err;
8431 ad493afc 2019-08-03 stsp static const struct got_error *
8432 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8433 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8434 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8435 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8437 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8438 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8439 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8440 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8441 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8442 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8443 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8444 9bc94a15 2019-08-03 stsp struct stat sb;
8446 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8447 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8448 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8449 2e1f37b0 2019-08-08 stsp return NULL;
8451 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8452 ad493afc 2019-08-03 stsp if (ie == NULL)
8453 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8455 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8457 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8459 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8460 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8462 f69721c3 2019-10-21 stsp goto done;
8463 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8464 f69721c3 2019-10-21 stsp id_str) == -1) {
8465 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8466 f69721c3 2019-10-21 stsp goto done;
8469 ad493afc 2019-08-03 stsp switch (staged_status) {
8470 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8471 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8472 ad493afc 2019-08-03 stsp blob_id, 8192);
8475 ad493afc 2019-08-03 stsp /* fall through */
8476 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8477 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8478 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8479 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8480 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8481 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8484 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8487 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8488 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8489 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8490 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8491 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8492 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8495 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8496 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8499 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8500 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8501 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8502 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8503 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8504 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8505 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8506 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8507 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8509 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8510 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8511 36bf999c 2020-07-23 stsp char *staged_target;
8512 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8513 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8515 36bf999c 2020-07-23 stsp goto done;
8516 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8517 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8518 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8519 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8520 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8521 36bf999c 2020-07-23 stsp free(staged_target);
8523 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8524 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8525 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8526 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8527 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8528 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8529 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8533 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8536 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8537 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8538 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8539 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8542 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8543 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8544 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8545 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8546 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8549 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8551 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8552 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8556 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8557 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8558 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8559 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8562 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8566 ad493afc 2019-08-03 stsp free(ondisk_path);
8567 ad493afc 2019-08-03 stsp if (blob_base)
8568 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8569 ad493afc 2019-08-03 stsp if (blob_staged)
8570 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8571 f69721c3 2019-10-21 stsp free(id_str);
8572 f69721c3 2019-10-21 stsp free(label_orig);
8573 ad493afc 2019-08-03 stsp return err;
8576 ad493afc 2019-08-03 stsp const struct got_error *
8577 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8578 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8579 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8580 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8581 ad493afc 2019-08-03 stsp struct got_repository *repo)
8583 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8584 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8585 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8586 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8587 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8589 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8591 ad493afc 2019-08-03 stsp return err;
8593 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8595 ad493afc 2019-08-03 stsp goto done;
8597 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8598 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8599 ad493afc 2019-08-03 stsp upa.repo = repo;
8600 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8601 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8602 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8603 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8604 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8605 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8606 6092c299 2021-10-04 thomas unstage_path, &upa, NULL, NULL, 1, 0);
8608 ad493afc 2019-08-03 stsp goto done;
8611 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8612 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8613 ad493afc 2019-08-03 stsp err = sync_err;
8615 ad493afc 2019-08-03 stsp free(fileindex_path);
8616 ad493afc 2019-08-03 stsp if (fileindex)
8617 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8618 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8619 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8620 ad493afc 2019-08-03 stsp err = unlockerr;
8621 ad493afc 2019-08-03 stsp return err;
8624 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8625 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8626 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8627 b2118c49 2020-07-28 stsp void *info_arg;
8628 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8629 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8630 b2118c49 2020-07-28 stsp void *cancel_arg;
8633 b2118c49 2020-07-28 stsp static const struct got_error *
8634 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8636 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8637 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8638 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8639 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8640 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8641 b2118c49 2020-07-28 stsp int stage;
8643 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8644 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8646 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8647 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8648 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8651 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8652 b2118c49 2020-07-28 stsp return NULL;
8654 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8655 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8656 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8658 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8659 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8660 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8661 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8662 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8663 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8666 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8667 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8668 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8671 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8672 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8675 b2118c49 2020-07-28 stsp const struct got_error *
8676 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8677 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8678 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8679 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8682 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8683 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8684 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8685 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8687 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8689 b2118c49 2020-07-28 stsp return err;
8691 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8693 b2118c49 2020-07-28 stsp goto done;
8695 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8696 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8697 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8698 b2118c49 2020-07-28 stsp arg.paths = paths;
8699 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8700 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8701 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8704 b2118c49 2020-07-28 stsp free(fileindex_path);
8705 b2118c49 2020-07-28 stsp if (fileindex)
8706 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8707 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8708 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8709 b2118c49 2020-07-28 stsp err = unlockerr;
8710 b2118c49 2020-07-28 stsp return err;
8713 814624e7 2022-03-22 thomas static const struct got_error *
8714 814624e7 2022-03-22 thomas patch_check_path(const char *p, char **path, unsigned char *status,
8715 814624e7 2022-03-22 thomas unsigned char *staged_status, struct got_fileindex *fileindex,
8716 814624e7 2022-03-22 thomas struct got_worktree *worktree, struct got_repository *repo)
8718 814624e7 2022-03-22 thomas const struct got_error *err;
8719 814624e7 2022-03-22 thomas struct got_fileindex_entry *ie;
8720 814624e7 2022-03-22 thomas struct stat sb;
8721 814624e7 2022-03-22 thomas char *ondisk_path = NULL;
8723 814624e7 2022-03-22 thomas err = got_worktree_resolve_path(path, worktree, p);
8724 814624e7 2022-03-22 thomas if (err)
8725 814624e7 2022-03-22 thomas return err;
8727 814624e7 2022-03-22 thomas if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
8728 814624e7 2022-03-22 thomas *path[0] ? "/" : "", *path) == -1)
8729 814624e7 2022-03-22 thomas return got_error_from_errno("asprintf");
8731 814624e7 2022-03-22 thomas ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
8732 814624e7 2022-03-22 thomas if (ie) {
8733 814624e7 2022-03-22 thomas *staged_status = get_staged_status(ie);
8734 814624e7 2022-03-22 thomas err = get_file_status(status, &sb, ie, *path, -1, NULL, repo);
8735 814624e7 2022-03-22 thomas if (err)
8736 814624e7 2022-03-22 thomas goto done;
8737 814624e7 2022-03-22 thomas } else {
8738 814624e7 2022-03-22 thomas *staged_status = GOT_STATUS_NO_CHANGE;
8739 814624e7 2022-03-22 thomas *status = GOT_STATUS_UNVERSIONED;
8740 814624e7 2022-03-22 thomas if (lstat(ondisk_path, &sb) == -1) {
8741 814624e7 2022-03-22 thomas if (errno != ENOENT) {
8742 814624e7 2022-03-22 thomas err = got_error_from_errno2("lstat",
8743 814624e7 2022-03-22 thomas ondisk_path);
8744 814624e7 2022-03-22 thomas goto done;
8746 814624e7 2022-03-22 thomas *status = GOT_STATUS_NONEXISTENT;
8751 814624e7 2022-03-22 thomas free(ondisk_path);
8752 814624e7 2022-03-22 thomas return err;
8755 814624e7 2022-03-22 thomas static const struct got_error *
8756 814624e7 2022-03-22 thomas patch_can_rm(const char *path, unsigned char status,
8757 814624e7 2022-03-22 thomas unsigned char staged_status)
8759 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
8760 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
8761 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
8762 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
8763 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY &&
8764 814624e7 2022-03-22 thomas status != GOT_STATUS_MODE_CHANGE)
8765 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8766 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
8767 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8768 814624e7 2022-03-22 thomas return NULL;
8771 814624e7 2022-03-22 thomas static const struct got_error *
8772 814624e7 2022-03-22 thomas patch_can_add(const char *path, unsigned char status)
8774 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NONEXISTENT)
8775 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8776 814624e7 2022-03-22 thomas return NULL;
8779 814624e7 2022-03-22 thomas static const struct got_error *
8780 814624e7 2022-03-22 thomas patch_can_edit(const char *path, unsigned char status,
8781 814624e7 2022-03-22 thomas unsigned char staged_status)
8783 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
8784 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
8785 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
8786 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
8787 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY)
8788 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8789 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
8790 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
8791 814624e7 2022-03-22 thomas return NULL;
8794 814624e7 2022-03-22 thomas const struct got_error *
8795 814624e7 2022-03-22 thomas got_worktree_patch_prepare(struct got_fileindex **fileindex,
8796 814624e7 2022-03-22 thomas struct got_worktree *worktree)
8798 814624e7 2022-03-22 thomas const struct got_error *err;
8799 814624e7 2022-03-22 thomas char *fileindex_path = NULL;
8801 814624e7 2022-03-22 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
8802 814624e7 2022-03-22 thomas free(fileindex_path);
8803 814624e7 2022-03-22 thomas return err;
8806 814624e7 2022-03-22 thomas const struct got_error *
8807 814624e7 2022-03-22 thomas got_worktree_patch_check_path(const char *old, const char *new,
8808 814624e7 2022-03-22 thomas char **oldpath, char **newpath, struct got_worktree *worktree,
8809 814624e7 2022-03-22 thomas struct got_repository *repo, struct got_fileindex *fileindex)
8811 814624e7 2022-03-22 thomas const struct got_error *err = NULL;
8812 814624e7 2022-03-22 thomas int file_renamed = 0;
8813 814624e7 2022-03-22 thomas unsigned char status_old, staged_status_old;
8814 814624e7 2022-03-22 thomas unsigned char status_new, staged_status_new;
8816 814624e7 2022-03-22 thomas *oldpath = NULL;
8817 814624e7 2022-03-22 thomas *newpath = NULL;
8819 814624e7 2022-03-22 thomas err = patch_check_path(old != NULL ? old : new, oldpath,
8820 814624e7 2022-03-22 thomas &status_old, &staged_status_old, fileindex, worktree, repo);
8821 814624e7 2022-03-22 thomas if (err)
8822 814624e7 2022-03-22 thomas goto done;
8824 814624e7 2022-03-22 thomas err = patch_check_path(new != NULL ? new : old, newpath,
8825 814624e7 2022-03-22 thomas &status_new, &staged_status_new, fileindex, worktree, repo);
8826 814624e7 2022-03-22 thomas if (err)
8827 814624e7 2022-03-22 thomas goto done;
8829 814624e7 2022-03-22 thomas if (old != NULL && new != NULL && strcmp(old, new) != 0)
8830 814624e7 2022-03-22 thomas file_renamed = 1;
8832 814624e7 2022-03-22 thomas if (old != NULL && new == NULL)
8833 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
8834 814624e7 2022-03-22 thomas else if (file_renamed) {
8835 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
8836 814624e7 2022-03-22 thomas if (err == NULL)
8837 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
8838 814624e7 2022-03-22 thomas } else if (old == NULL)
8839 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
8841 814624e7 2022-03-22 thomas err = patch_can_edit(*newpath, status_new, staged_status_new);
8844 814624e7 2022-03-22 thomas if (err) {
8845 814624e7 2022-03-22 thomas free(*oldpath);
8846 814624e7 2022-03-22 thomas *oldpath = NULL;
8847 814624e7 2022-03-22 thomas free(*newpath);
8848 814624e7 2022-03-22 thomas *newpath = NULL;
8850 814624e7 2022-03-22 thomas return err;
8853 814624e7 2022-03-22 thomas const struct got_error *
8854 814624e7 2022-03-22 thomas got_worktree_patch_complete(struct got_fileindex *fileindex)
8856 814624e7 2022-03-22 thomas got_fileindex_free(fileindex);
8857 814624e7 2022-03-22 thomas return NULL;
