2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
19 133d2798 2019-01-08 stsp #include <sys/tree.h>
21 d1f6d47b 2019-02-04 stsp #include <dirent.h>
22 12ce7a6c 2019-08-12 stsp #include <limits.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 303e14b5 2019-09-23 stsp #include <time.h>
28 86c3caaf 2018-03-09 stsp #include <fcntl.h>
29 86c3caaf 2018-03-09 stsp #include <errno.h>
30 86c3caaf 2018-03-09 stsp #include <unistd.h>
31 9d31a1d8 2018-03-11 stsp #include <sha1.h>
32 9d31a1d8 2018-03-11 stsp #include <zlib.h>
33 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
34 512f0d0e 2019-01-02 stsp #include <libgen.h>
35 ec22038e 2019-03-10 stsp #include <uuid.h>
36 7154f6ce 2019-03-27 stsp #include <util.h>
38 86c3caaf 2018-03-09 stsp #include "got_error.h"
39 86c3caaf 2018-03-09 stsp #include "got_repository.h"
40 5261c201 2018-04-01 stsp #include "got_reference.h"
41 9d31a1d8 2018-03-11 stsp #include "got_object.h"
42 1dd54920 2019-05-11 stsp #include "got_path.h"
43 e6209546 2019-08-22 stsp #include "got_cancel.h"
44 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 234035bc 2019-06-01 stsp #include "got_diff.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
51 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
52 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
53 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
54 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
55 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
56 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
57 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
61 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
65 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
67 b2b3fce1 2022-10-29 op static mode_t apply_umask(mode_t);
69 99724ed4 2018-03-10 stsp static const struct got_error *
70 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
72 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
75 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
76 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
78 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
83 507dc3bb 2018-12-29 stsp static const struct got_error *
84 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
86 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
87 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
88 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
89 507dc3bb 2018-12-29 stsp char *path = NULL;
91 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
92 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
93 507dc3bb 2018-12-29 stsp path = NULL;
97 b90054ed 2022-11-01 stsp err = got_opentemp_named(&tmppath, &tmpfile, path, "");
101 507dc3bb 2018-12-29 stsp if (content) {
102 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
103 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
104 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
109 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
110 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
111 2a57020b 2019-02-20 stsp unlink(tmppath);
116 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
117 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
118 230a42bd 2019-05-11 jcs free(tmppath);
119 09fe317a 2018-03-11 stsp return err;
122 024e9686 2019-05-14 stsp static const struct got_error *
123 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
125 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
126 024e9686 2019-05-14 stsp char *refstr = NULL;
128 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
129 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
130 024e9686 2019-05-14 stsp if (refstr == NULL)
131 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
133 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
134 024e9686 2019-05-14 stsp if (refstr == NULL)
135 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
137 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
138 024e9686 2019-05-14 stsp free(refstr);
139 024e9686 2019-05-14 stsp return err;
142 86c3caaf 2018-03-09 stsp const struct got_error *
143 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
144 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
146 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
147 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
148 ec22038e 2019-03-10 stsp uuid_t uuid;
149 ec22038e 2019-03-10 stsp uint32_t uuid_status;
150 65596e15 2018-12-24 stsp int obj_type;
151 7ac97322 2018-03-11 stsp char *path_got = NULL;
152 1451e70d 2018-03-10 stsp char *formatstr = NULL;
153 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
154 65596e15 2018-12-24 stsp char *basestr = NULL;
155 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
157 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
158 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
162 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
164 65596e15 2018-12-24 stsp return err;
165 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
167 65596e15 2018-12-24 stsp return err;
168 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
169 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
171 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
172 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
173 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
176 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
177 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
178 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
182 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
183 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
184 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
187 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
188 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
192 056e7441 2018-03-11 stsp /* Create an empty lock file. */
193 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
197 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
198 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
202 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
203 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
207 65596e15 2018-12-24 stsp /* Record our base commit. */
208 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
211 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
215 1451e70d 2018-03-10 stsp /* Store path to repository. */
216 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
217 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
221 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
222 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
223 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
227 ec22038e 2019-03-10 stsp /* Generate UUID. */
228 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
229 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
230 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
233 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
234 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
235 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
238 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
242 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
243 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
244 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
247 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
252 65596e15 2018-12-24 stsp free(commit_id);
253 7ac97322 2018-03-11 stsp free(path_got);
254 1451e70d 2018-03-10 stsp free(formatstr);
255 0bb8a95e 2018-03-12 stsp free(absprefix);
256 65596e15 2018-12-24 stsp free(basestr);
257 ec22038e 2019-03-10 stsp free(uuidstr);
258 86c3caaf 2018-03-09 stsp return err;
261 247140b2 2019-02-05 stsp const struct got_error *
262 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
263 e5dc7198 2018-12-29 stsp const char *path_prefix)
265 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
267 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
268 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
269 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
271 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
272 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
273 e5dc7198 2018-12-29 stsp free(absprefix);
274 e5dc7198 2018-12-29 stsp return NULL;
277 bc70eb79 2019-05-09 stsp const char *
278 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
280 36a38700 2019-05-10 stsp return worktree->head_ref_name;
283 024e9686 2019-05-14 stsp const struct got_error *
284 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
285 024e9686 2019-05-14 stsp struct got_reference *head_ref)
287 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
288 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
290 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
291 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
292 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
293 024e9686 2019-05-14 stsp path_got = NULL;
297 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
298 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
299 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
303 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
307 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
308 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
310 024e9686 2019-05-14 stsp free(path_got);
312 024e9686 2019-05-14 stsp free(head_ref_name);
313 024e9686 2019-05-14 stsp return err;
316 b72f483a 2019-02-05 stsp struct got_object_id *
317 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
319 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
322 507dc3bb 2018-12-29 stsp const struct got_error *
323 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
324 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
326 507dc3bb 2018-12-29 stsp const struct got_error *err;
327 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
328 507dc3bb 2018-12-29 stsp char *id_str = NULL;
329 507dc3bb 2018-12-29 stsp char *path_got = NULL;
331 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
332 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
333 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
334 507dc3bb 2018-12-29 stsp path_got = NULL;
338 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
340 507dc3bb 2018-12-29 stsp return err;
342 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
343 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
347 507dc3bb 2018-12-29 stsp /* Record our base commit. */
348 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
351 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
355 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
356 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
357 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
358 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
363 507dc3bb 2018-12-29 stsp got_object_close(obj);
364 507dc3bb 2018-12-29 stsp free(id_str);
365 507dc3bb 2018-12-29 stsp free(path_got);
366 507dc3bb 2018-12-29 stsp return err;
369 50b0790e 2020-09-11 stsp const struct got_gotconfig *
370 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
372 50b0790e 2020-09-11 stsp return worktree->gotconfig;
375 9d31a1d8 2018-03-11 stsp static const struct got_error *
376 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
378 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
379 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
380 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
381 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
382 86c3caaf 2018-03-09 stsp return NULL;
385 21908da4 2019-01-13 stsp static const struct got_error *
386 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
388 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
389 4a1ddfc2 2019-01-12 stsp char *abspath;
391 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
392 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
394 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
395 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
396 ddcd8544 2019-03-11 stsp struct stat sb;
397 ddcd8544 2019-03-11 stsp err = NULL;
398 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
399 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
400 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
401 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
402 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
405 4a1ddfc2 2019-01-12 stsp free(abspath);
406 68c76935 2019-02-19 stsp return err;
409 68c76935 2019-02-19 stsp static const struct got_error *
410 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
412 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
413 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
414 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
415 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
420 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
421 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
422 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
425 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
426 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
427 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
430 68c76935 2019-02-19 stsp if (flen1 == 0) {
431 68c76935 2019-02-19 stsp if (flen2 != 0)
434 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
435 68c76935 2019-02-19 stsp if (flen1 != 0)
438 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
439 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
449 68c76935 2019-02-19 stsp return err;
452 68c76935 2019-02-19 stsp static const struct got_error *
453 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
455 68c76935 2019-02-19 stsp struct stat sb;
456 68c76935 2019-02-19 stsp size_t size1, size2;
460 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
461 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
462 68c76935 2019-02-19 stsp size1 = sb.st_size;
464 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
465 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
466 68c76935 2019-02-19 stsp size2 = sb.st_size;
468 68c76935 2019-02-19 stsp if (size1 != size2) {
470 68c76935 2019-02-19 stsp return NULL;
473 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
474 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
475 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
476 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
478 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
481 0e039681 2021-11-15 stsp static const struct got_error *
482 0e039681 2021-11-15 stsp copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
484 0e039681 2021-11-15 stsp uint8_t fbuf[65536];
485 0e039681 2021-11-15 stsp size_t flen;
486 0e039681 2021-11-15 stsp ssize_t outlen;
488 0e039681 2021-11-15 stsp *outsize = 0;
490 0e039681 2021-11-15 stsp if (fseek(f, 0L, SEEK_SET) == -1)
491 0e039681 2021-11-15 stsp return got_ferror(f, GOT_ERR_IO);
494 0e039681 2021-11-15 stsp flen = fread(fbuf, 1, sizeof(fbuf), f);
495 0e039681 2021-11-15 stsp if (flen == 0) {
496 0e039681 2021-11-15 stsp if (ferror(f))
497 0e039681 2021-11-15 stsp return got_error_from_errno("fread");
498 0e039681 2021-11-15 stsp if (feof(f))
501 0e039681 2021-11-15 stsp outlen = write(outfd, fbuf, flen);
502 0e039681 2021-11-15 stsp if (outlen == -1)
503 0e039681 2021-11-15 stsp return got_error_from_errno("write");
504 0e039681 2021-11-15 stsp if (outlen != flen)
505 0e039681 2021-11-15 stsp return got_error(GOT_ERR_IO);
506 0e039681 2021-11-15 stsp *outsize += outlen;
509 0e039681 2021-11-15 stsp return NULL;
512 0e039681 2021-11-15 stsp static const struct got_error *
513 0e039681 2021-11-15 stsp merge_binary_file(int *overlapcnt, int merged_fd,
514 0e039681 2021-11-15 stsp FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
515 0e039681 2021-11-15 stsp const char *label_deriv, const char *label_orig, const char *label_deriv2,
516 0e039681 2021-11-15 stsp const char *ondisk_path)
518 0e039681 2021-11-15 stsp const struct got_error *err = NULL;
519 0e039681 2021-11-15 stsp int same_content, changed_deriv, changed_deriv2;
520 0e039681 2021-11-15 stsp int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
521 0e039681 2021-11-15 stsp off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
522 0e039681 2021-11-15 stsp char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
523 0e039681 2021-11-15 stsp char *base_path_orig = NULL, *base_path_deriv = NULL;
524 0e039681 2021-11-15 stsp char *base_path_deriv2 = NULL;
526 0e039681 2021-11-15 stsp *overlapcnt = 0;
528 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_deriv2);
530 0e039681 2021-11-15 stsp return err;
532 0e039681 2021-11-15 stsp if (same_content)
533 0e039681 2021-11-15 stsp return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
535 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_orig);
537 0e039681 2021-11-15 stsp return err;
538 0e039681 2021-11-15 stsp changed_deriv = !same_content;
539 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv2, f_orig);
541 0e039681 2021-11-15 stsp return err;
542 0e039681 2021-11-15 stsp changed_deriv2 = !same_content;
544 0e039681 2021-11-15 stsp if (changed_deriv && changed_deriv2) {
545 0e039681 2021-11-15 stsp *overlapcnt = 1;
546 0e039681 2021-11-15 stsp if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
547 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
550 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
551 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
554 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
555 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
558 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_orig, &fd_orig,
559 b90054ed 2022-11-01 stsp base_path_orig, "");
562 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
563 b90054ed 2022-11-01 stsp base_path_deriv, "");
566 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
567 b90054ed 2022-11-01 stsp base_path_deriv2, "");
570 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
573 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
576 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
579 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "Binary files differ and cannot be "
580 0e039681 2021-11-15 stsp "merged automatically:\n") < 0) {
581 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
584 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
585 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
586 0e039681 2021-11-15 stsp label_deriv ? " " : "",
587 0e039681 2021-11-15 stsp label_deriv ? label_deriv : "",
588 0e039681 2021-11-15 stsp path_deriv) < 0) {
589 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
592 0e039681 2021-11-15 stsp if (size_orig > 0) {
593 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
594 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_ORIG,
595 0e039681 2021-11-15 stsp label_orig ? " " : "",
596 0e039681 2021-11-15 stsp label_orig ? label_orig : "",
597 0e039681 2021-11-15 stsp path_orig) < 0) {
598 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
602 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
603 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
604 0e039681 2021-11-15 stsp path_deriv2,
605 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_END,
606 0e039681 2021-11-15 stsp label_deriv2 ? " " : "",
607 0e039681 2021-11-15 stsp label_deriv2 ? label_deriv2 : "") < 0) {
608 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
611 0e039681 2021-11-15 stsp } else if (changed_deriv)
612 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
613 0e039681 2021-11-15 stsp else if (changed_deriv2)
614 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
616 0e039681 2021-11-15 stsp if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
617 0e039681 2021-11-15 stsp err == NULL)
618 0e039681 2021-11-15 stsp err = got_error_from_errno2("unlink", path_orig);
619 0e039681 2021-11-15 stsp if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
620 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_orig);
621 0e039681 2021-11-15 stsp if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
622 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv);
623 0e039681 2021-11-15 stsp if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
624 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv2);
625 0e039681 2021-11-15 stsp free(path_orig);
626 0e039681 2021-11-15 stsp free(path_deriv);
627 0e039681 2021-11-15 stsp free(path_deriv2);
628 0e039681 2021-11-15 stsp free(base_path_orig);
629 0e039681 2021-11-15 stsp free(base_path_deriv);
630 0e039681 2021-11-15 stsp free(base_path_deriv2);
631 0e039681 2021-11-15 stsp return err;
635 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
636 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
637 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
638 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
639 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
641 6353ad76 2019-02-08 stsp static const struct got_error *
642 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
643 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
644 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
645 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
646 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
647 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
649 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
650 6353ad76 2019-02-08 stsp int merged_fd = -1;
651 db590691 2021-06-02 stsp FILE *f_merged = NULL;
652 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
653 234035bc 2019-06-01 stsp int overlapcnt = 0;
654 3524bbf9 2020-10-20 stsp char *parent = NULL;
656 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
658 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
660 3524bbf9 2020-10-20 stsp return err;
662 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
663 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
667 b90054ed 2022-11-01 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
671 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
672 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
674 0e039681 2021-11-15 stsp if (err->code != GOT_ERR_FILE_BINARY)
676 0e039681 2021-11-15 stsp err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
677 0e039681 2021-11-15 stsp f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
678 0e039681 2021-11-15 stsp ondisk_path);
683 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
684 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
688 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
693 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
694 db590691 2021-06-02 stsp if (f_merged == NULL) {
695 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
698 db590691 2021-06-02 stsp merged_fd = -1;
700 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
701 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
702 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
708 b2b3fce1 2022-10-29 op if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
709 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
713 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
714 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
715 230a42bd 2019-05-11 jcs ondisk_path);
720 fdcb7daf 2019-12-15 stsp if (merged_path)
721 fdcb7daf 2019-12-15 stsp unlink(merged_path);
723 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
724 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
725 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
726 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
727 6353ad76 2019-02-08 stsp free(merged_path);
728 af54ae4a 2019-02-19 stsp free(base_path);
729 3524bbf9 2020-10-20 stsp free(parent);
730 af57b12a 2020-07-23 stsp return err;
733 af57b12a 2020-07-23 stsp static const struct got_error *
734 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
735 af57b12a 2020-07-23 stsp size_t target_len)
737 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
738 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
739 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
740 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
741 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
742 af57b12a 2020-07-23 stsp ondisk_path);
743 af57b12a 2020-07-23 stsp return NULL;
747 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
748 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
749 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
750 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
752 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
753 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
755 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
756 993e2a1b 2020-07-23 stsp * has deleted this symlink.
758 11cc08c1 2020-07-23 stsp static const struct got_error *
759 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
760 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
761 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
763 11cc08c1 2020-07-23 stsp const struct got_error *err;
764 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
765 11cc08c1 2020-07-23 stsp FILE *f = NULL;
767 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
769 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
771 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
772 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
773 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
777 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
779 3818e3c4 2020-11-01 naddy goto done;
781 b2b3fce1 2022-10-29 op if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
782 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
786 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
787 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
788 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
789 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
790 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
791 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
792 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
793 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
794 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
795 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
799 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
800 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
803 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
804 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
808 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
809 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
810 11cc08c1 2020-07-23 stsp free(path);
811 11cc08c1 2020-07-23 stsp free(id_str);
812 11cc08c1 2020-07-23 stsp free(label_deriv);
813 11cc08c1 2020-07-23 stsp return err;
816 d219f183 2020-07-23 stsp /* forward declaration */
817 d219f183 2020-07-23 stsp static const struct got_error *
818 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
819 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
820 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
821 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
824 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
825 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
826 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
827 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
829 af57b12a 2020-07-23 stsp static const struct got_error *
830 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
831 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
832 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
833 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
834 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
836 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
837 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
838 af57b12a 2020-07-23 stsp struct stat sb;
839 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
840 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
841 11cc08c1 2020-07-23 stsp int have_local_change = 0;
842 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
844 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
845 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
847 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
848 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
849 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
850 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
851 af57b12a 2020-07-23 stsp ondisk_path);
854 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
856 526a746f 2020-07-23 stsp if (blob_orig) {
857 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
862 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
863 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
864 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
865 11cc08c1 2020-07-23 stsp have_local_change = 1;
867 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
868 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
869 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
870 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
871 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
873 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
874 11cc08c1 2020-07-23 stsp if (ancestor_target) {
875 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
876 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
878 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
879 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
880 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
881 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
884 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
885 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
886 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
887 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
890 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
893 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
894 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
895 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
896 af57b12a 2020-07-23 stsp strlen(deriv_target));
899 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
900 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
901 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
902 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
903 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
904 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
907 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
908 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
909 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
912 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
918 af57b12a 2020-07-23 stsp free(ancestor_target);
919 eec2f5a9 2021-06-03 stsp return err;
922 eec2f5a9 2021-06-03 stsp static const struct got_error *
923 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
925 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
926 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
927 eec2f5a9 2021-06-03 stsp ssize_t target_len;
931 eec2f5a9 2021-06-03 stsp *outfile = NULL;
933 eec2f5a9 2021-06-03 stsp f = got_opentemp();
934 eec2f5a9 2021-06-03 stsp if (f == NULL)
935 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
936 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
937 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
938 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
941 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
942 eec2f5a9 2021-06-03 stsp if (n != target_len) {
943 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
946 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
947 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
950 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
951 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
958 eec2f5a9 2021-06-03 stsp *outfile = f;
959 14c901f1 2019-08-08 stsp return err;
963 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
964 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
965 14c901f1 2019-08-08 stsp * acts as the second derived version.
967 14c901f1 2019-08-08 stsp static const struct got_error *
968 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
969 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
970 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
971 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
972 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
973 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
975 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
976 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
977 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
978 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
979 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
981 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
983 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
985 ed6b5030 2020-10-20 stsp return err;
987 67a66647 2021-05-31 stsp if (blob_orig) {
988 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
989 67a66647 2021-05-31 stsp parent) == -1) {
990 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
991 67a66647 2021-05-31 stsp base_path = NULL;
995 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_orig_path, &f_orig,
996 b90054ed 2022-11-01 stsp base_path, "");
999 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1000 67a66647 2021-05-31 stsp blob_orig);
1002 67a66647 2021-05-31 stsp goto done;
1003 67a66647 2021-05-31 stsp free(base_path);
1006 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1007 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1008 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1010 db590691 2021-06-02 stsp f_orig = got_opentemp();
1011 db590691 2021-06-02 stsp if (f_orig == NULL) {
1012 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1013 db590691 2021-06-02 stsp goto done;
1017 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1018 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1019 14c901f1 2019-08-08 stsp base_path = NULL;
1020 14c901f1 2019-08-08 stsp goto done;
1023 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1025 14c901f1 2019-08-08 stsp goto done;
1026 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1027 14c901f1 2019-08-08 stsp blob_deriv);
1029 14c901f1 2019-08-08 stsp goto done;
1031 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1033 14c901f1 2019-08-08 stsp goto done;
1034 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1035 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1036 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1037 14c901f1 2019-08-08 stsp goto done;
1041 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1042 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1044 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1045 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1047 eec2f5a9 2021-06-03 stsp goto done;
1050 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1051 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1052 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1053 eec2f5a9 2021-06-03 stsp goto done;
1055 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1056 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1057 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1058 eec2f5a9 2021-06-03 stsp close(fd);
1059 eec2f5a9 2021-06-03 stsp goto done;
1063 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1064 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1065 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1067 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1068 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1069 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1070 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1071 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1072 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1073 14c901f1 2019-08-08 stsp free(base_path);
1074 67a66647 2021-05-31 stsp if (blob_orig_path) {
1075 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1076 67a66647 2021-05-31 stsp free(blob_orig_path);
1078 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1079 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1080 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1082 6353ad76 2019-02-08 stsp free(id_str);
1083 818c7501 2019-07-11 stsp free(label_deriv);
1084 ed6b5030 2020-10-20 stsp free(parent);
1085 4a1ddfc2 2019-01-12 stsp return err;
1088 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1089 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1090 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1091 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1093 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1094 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1096 65b05cec 2020-07-23 stsp *new_iep = NULL;
1098 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1100 054041d0 2020-06-24 stsp return err;
1102 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1103 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1105 054041d0 2020-06-24 stsp goto done;
1107 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1110 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1112 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1113 13d9040b 2019-03-27 stsp return err;
1116 1ebedb77 2019-10-19 stsp static mode_t
1117 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1119 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1121 1ebedb77 2019-10-19 stsp if (executable) {
1122 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1123 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1124 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1125 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1126 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1127 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1130 b2b3fce1 2022-10-29 op return st_mode;
1133 b2b3fce1 2022-10-29 op static mode_t
1134 b2b3fce1 2022-10-29 op apply_umask(mode_t mode)
1138 b2b3fce1 2022-10-29 op um = umask(000);
1140 b2b3fce1 2022-10-29 op return mode & ~um;
1143 8ba819a3 2020-07-23 stsp /* forward declaration */
1144 13d9040b 2019-03-27 stsp static const struct got_error *
1145 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1146 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1147 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1148 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1149 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1150 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1153 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1154 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1156 8ba819a3 2020-07-23 stsp static const struct got_error *
1157 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1158 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1160 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1161 5a1fbc73 2020-07-23 stsp ssize_t elen;
1162 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1165 c6e8a826 2021-04-05 stsp *did_something = 0;
1168 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1169 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1170 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1171 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1172 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1173 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1175 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1176 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1177 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink())
1178 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1180 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1181 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1182 5a1fbc73 2020-07-23 stsp if (elen == -1)
1183 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1185 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1186 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1187 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1190 c6e8a826 2021-04-05 stsp *did_something = 1;
1191 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1192 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1193 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1194 5a1fbc73 2020-07-23 stsp return err;
1197 3c1ec782 2020-07-23 stsp static const struct got_error *
1198 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1199 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1201 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1202 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1203 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1205 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1207 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1208 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1209 3c1ec782 2020-07-23 stsp return NULL;
1213 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1214 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1215 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1216 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1217 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1219 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1220 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1221 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1223 ce031e9e 2020-10-20 stsp return err;
1224 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1225 ce031e9e 2020-10-20 stsp free(parent);
1226 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1228 ce031e9e 2020-10-20 stsp free(parent);
1229 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1230 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1231 3c1ec782 2020-07-23 stsp free(abspath);
1232 3c1ec782 2020-07-23 stsp return err;
1234 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1235 3c1ec782 2020-07-23 stsp free(abspath);
1237 3c1ec782 2020-07-23 stsp return err;
1239 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1241 3c1ec782 2020-07-23 stsp return err;
1244 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1245 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1246 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1247 3c1ec782 2020-07-23 stsp return NULL;
1250 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1251 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1252 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1253 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1254 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1255 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1257 3c1ec782 2020-07-23 stsp free(path_got);
1258 3c1ec782 2020-07-23 stsp return NULL;
1261 5a1fbc73 2020-07-23 stsp static const struct got_error *
1262 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1263 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1264 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1265 5267b9e4 2021-09-26 stsp int path_is_unversioned, int allow_bad_symlinks,
1266 5267b9e4 2021-09-26 stsp struct got_repository *repo,
1267 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1269 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1270 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1271 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1272 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1273 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1275 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1278 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1279 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1280 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1281 8ba819a3 2020-07-23 stsp * in the blob object.
1284 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1285 538b6881 2022-07-21 florian if (err)
1286 538b6881 2022-07-21 florian return err;
1288 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1289 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1290 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1291 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1292 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1293 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1294 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1295 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1296 3b9f0f87 2020-07-23 stsp progress_arg);
1298 8ba819a3 2020-07-23 stsp if (len > 0) {
1299 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1300 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1301 8ba819a3 2020-07-23 stsp len - hdrlen);
1302 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1303 8ba819a3 2020-07-23 stsp hdrlen = 0;
1305 8ba819a3 2020-07-23 stsp } while (len != 0);
1306 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1308 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1309 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1311 3c1ec782 2020-07-23 stsp return err;
1313 5267b9e4 2021-09-26 stsp if (*is_bad_symlink && !allow_bad_symlinks) {
1314 906c123b 2020-07-23 stsp /* install as a regular file */
1315 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1316 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1317 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1318 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1319 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1320 3c29341b 2022-07-21 florian return err;
1323 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1324 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1325 c6e8a826 2021-04-05 stsp int symlink_replaced;
1326 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1327 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1328 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1329 3c29341b 2022-07-21 florian return err;
1331 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1332 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1334 3c29341b 2022-07-21 florian return err;
1335 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1336 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1337 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1338 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1339 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1340 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1342 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1343 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1346 3c29341b 2022-07-21 florian return err; /* Nothing else to do. */
1349 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1350 f4994adc 2020-10-20 stsp char *parent;
1351 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1353 3c29341b 2022-07-21 florian return err;
1354 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1355 f4994adc 2020-10-20 stsp free(parent);
1357 3c29341b 2022-07-21 florian return err;
1359 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1360 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1362 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1363 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1364 3c29341b 2022-07-21 florian return err;
1368 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1369 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1370 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1371 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1372 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1373 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1374 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1375 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1376 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1377 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1378 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1379 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1380 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1382 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1383 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1385 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1386 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1387 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1388 8ba819a3 2020-07-23 stsp return err;
1391 8ba819a3 2020-07-23 stsp static const struct got_error *
1392 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1393 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1394 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1395 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1396 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1397 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1399 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1400 507dc3bb 2018-12-29 stsp int fd = -1;
1401 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1402 507dc3bb 2018-12-29 stsp int update = 0;
1403 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1404 b2b3fce1 2022-10-29 op mode_t mode;
1406 b2b3fce1 2022-10-29 op mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1407 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1408 b2b3fce1 2022-10-29 op O_CLOEXEC, mode);
1409 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1410 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1411 f5375317 2020-10-20 stsp char *parent;
1412 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1414 f5375317 2020-10-20 stsp return err;
1415 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1416 f5375317 2020-10-20 stsp free(parent);
1418 21908da4 2019-01-13 stsp return err;
1419 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1420 8bd0cdad 2021-12-31 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1422 21908da4 2019-01-13 stsp if (fd == -1)
1423 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1424 230a42bd 2019-05-11 jcs ondisk_path);
1425 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1426 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1427 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1428 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1429 3b9f0f87 2020-07-23 stsp goto done;
1431 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1432 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1433 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1434 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1435 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1436 507dc3bb 2018-12-29 stsp goto done;
1438 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1439 b90054ed 2022-11-01 stsp ondisk_path, "");
1441 507dc3bb 2018-12-29 stsp goto done;
1442 507dc3bb 2018-12-29 stsp update = 1;
1444 b2b3fce1 2022-10-29 op if (fchmod(fd, apply_umask(mode)) == -1) {
1445 b2b3fce1 2022-10-29 op err = got_error_from_errno2("fchmod",
1451 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1454 bd6aa359 2020-07-23 stsp if (progress_cb) {
1455 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1456 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1458 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1459 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1462 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1463 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1465 bd6aa359 2020-07-23 stsp goto done;
1468 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1470 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1471 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1474 9d31a1d8 2018-03-11 stsp if (len > 0) {
1475 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1476 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1477 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1478 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1479 b87c6f83 2018-12-24 stsp goto done;
1480 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1481 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1482 b87c6f83 2018-12-24 stsp goto done;
1484 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1486 9d31a1d8 2018-03-11 stsp } while (len != 0);
1488 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1489 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1490 816dc654 2019-02-16 stsp goto done;
1493 507dc3bb 2018-12-29 stsp if (update) {
1494 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1495 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1496 f6d8c0ac 2020-11-09 stsp goto done;
1498 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1499 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1500 230a42bd 2019-05-11 jcs ondisk_path);
1501 68ed9ba5 2019-02-10 stsp goto done;
1503 63df146d 2020-11-09 stsp free(tmppath);
1504 63df146d 2020-11-09 stsp tmppath = NULL;
1508 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1509 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1510 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1511 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1512 507dc3bb 2018-12-29 stsp free(tmppath);
1513 6353ad76 2019-02-08 stsp return err;
1516 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1517 6353ad76 2019-02-08 stsp static const struct got_error *
1518 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1520 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1521 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1522 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1523 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1524 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1526 7154f6ce 2019-03-27 stsp int i = 0;
1527 9bdd68dd 2021-01-02 naddy char *line = NULL;
1528 9bdd68dd 2021-01-02 naddy size_t linesize = 0;
1529 9bdd68dd 2021-01-02 naddy ssize_t linelen;
1531 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1532 9bdd68dd 2021-01-02 naddy linelen = getline(&line, &linesize, f);
1533 9bdd68dd 2021-01-02 naddy if (linelen == -1) {
1534 7154f6ce 2019-03-27 stsp if (feof(f))
1536 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1540 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1541 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1543 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1548 9bdd68dd 2021-01-02 naddy free(line);
1550 7154f6ce 2019-03-27 stsp return err;
1553 e2b1e152 2019-07-13 stsp static int
1554 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1556 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1557 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1560 1ebedb77 2019-10-19 stsp static int
1561 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1563 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1564 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1565 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1566 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1567 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1568 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1571 c363b2c1 2019-08-03 stsp static unsigned char
1572 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1574 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1575 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1576 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1577 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1578 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1579 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1580 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1582 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1586 a919d5c4 2020-07-23 stsp static const struct got_error *
1587 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1588 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1589 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1591 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1592 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1593 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1594 a919d5c4 2020-07-23 stsp ssize_t elen;
1595 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1596 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1597 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1599 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1601 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1603 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1605 a919d5c4 2020-07-23 stsp return err;
1606 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1608 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1609 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1611 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1613 a919d5c4 2020-07-23 stsp if (len > 0) {
1614 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1615 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1616 a919d5c4 2020-07-23 stsp len - hdrlen);
1617 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1618 a919d5c4 2020-07-23 stsp hdrlen = 0;
1620 a919d5c4 2020-07-23 stsp } while (len != 0);
1621 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1623 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1624 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1625 a919d5c4 2020-07-23 stsp if (elen == -1)
1626 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1628 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1629 a919d5c4 2020-07-23 stsp if (elen == -1)
1630 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1633 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1634 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1636 a919d5c4 2020-07-23 stsp return NULL;
1639 7154f6ce 2019-03-27 stsp static const struct got_error *
1640 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1641 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1642 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1644 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1645 6353ad76 2019-02-08 stsp struct got_object_id id;
1646 6353ad76 2019-02-08 stsp size_t hdrlen;
1647 eb81bc23 2022-06-28 tracey int fd = -1, fd1 = -1;
1648 6353ad76 2019-02-08 stsp FILE *f = NULL;
1649 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1650 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1651 6353ad76 2019-02-08 stsp size_t flen, blen;
1652 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1654 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1655 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1658 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1659 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1660 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1662 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1663 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1664 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1665 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1666 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1668 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1669 882ef1b9 2019-12-13 stsp goto done;
1671 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1672 3d35a492 2019-12-13 stsp goto done;
1675 8bd0cdad 2021-12-31 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1676 5c02d2a5 2021-09-26 stsp if (fd == -1 && errno != ENOENT &&
1677 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
1678 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1679 5c02d2a5 2021-09-26 stsp else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1680 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1681 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1682 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1683 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1684 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1685 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1687 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1688 3d35a492 2019-12-13 stsp goto done;
1690 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1691 1338848f 2019-12-13 stsp goto done;
1695 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1696 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1697 1338848f 2019-12-13 stsp goto done;
1700 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1701 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1702 1338848f 2019-12-13 stsp goto done;
1703 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1704 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1705 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1706 1338848f 2019-12-13 stsp goto done;
1709 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1710 f179e66d 2020-07-23 stsp goto done;
1712 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1713 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1714 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1715 1338848f 2019-12-13 stsp goto done;
1718 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1719 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1720 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1722 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1724 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1725 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1726 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1727 eb81bc23 2022-06-28 tracey goto done;
1729 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1731 1338848f 2019-12-13 stsp goto done;
1733 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1734 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1735 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1736 a919d5c4 2020-07-23 stsp goto done;
1739 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1740 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1741 ab0d4361 2019-12-13 stsp if (fd == -1) {
1742 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1743 ab0d4361 2019-12-13 stsp goto done;
1747 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1748 6353ad76 2019-02-08 stsp if (f == NULL) {
1749 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1750 6353ad76 2019-02-08 stsp goto done;
1753 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1755 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1756 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1758 7154f6ce 2019-03-27 stsp goto done;
1759 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1760 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1761 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1762 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1763 7154f6ce 2019-03-27 stsp goto done;
1765 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1766 6353ad76 2019-02-08 stsp if (flen != 0)
1767 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1769 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1770 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1771 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1773 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1774 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1775 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1776 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1780 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1783 6353ad76 2019-02-08 stsp hdrlen = 0;
1786 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1787 7154f6ce 2019-03-27 stsp rewind(f);
1788 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1789 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1790 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1792 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1793 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
1795 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1796 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1797 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1798 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1799 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1800 9d31a1d8 2018-03-11 stsp return err;
1804 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1805 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1807 e2b1e152 2019-07-13 stsp static const struct got_error *
1808 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1809 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1811 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1812 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1813 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1815 e2b1e152 2019-07-13 stsp return NULL;
1818 9d31a1d8 2018-03-11 stsp static const struct got_error *
1819 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1820 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1821 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1822 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1823 0584f854 2019-04-06 stsp void *progress_arg)
1825 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1826 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1827 eb81bc23 2022-06-28 tracey char *ondisk_path = NULL;
1828 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1829 b8f41171 2019-02-10 stsp struct stat sb;
1830 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
1832 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1833 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1836 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1837 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1838 a76c42e6 2019-08-03 stsp goto done;
1840 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1843 abb4604f 2019-07-27 stsp goto done;
1844 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1845 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1847 f6764181 2021-09-24 stsp if (stat(ondisk_path, &sb) == -1) {
1848 f6764181 2021-09-24 stsp if (errno != ENOENT) {
1849 f6764181 2021-09-24 stsp err = got_error_from_errno2("stat",
1850 f6764181 2021-09-24 stsp ondisk_path);
1851 f6764181 2021-09-24 stsp goto done;
1853 f6764181 2021-09-24 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1854 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1856 f6764181 2021-09-24 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1857 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1859 f6764181 2021-09-24 stsp status = GOT_STATUS_OBSTRUCTED;
1863 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1865 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1866 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1867 b8f41171 2019-02-10 stsp goto done;
1869 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1871 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1872 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1874 5036ab18 2020-04-18 stsp goto done;
1877 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1878 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1879 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1881 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1882 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1883 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1884 c6e8a826 2021-04-05 stsp * updating contents of this file.
1886 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1887 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1888 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1889 c6e8a826 2021-04-05 stsp /* Same commit. */
1890 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1891 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1893 e2b1e152 2019-07-13 stsp goto done;
1894 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1896 6353ad76 2019-02-08 stsp goto done;
1898 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1899 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1900 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1901 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1902 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1903 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1905 0f58026f 2021-04-05 stsp goto done;
1906 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1908 b8f41171 2019-02-10 stsp goto done;
1912 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1913 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1914 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1915 eb81bc23 2022-06-28 tracey goto done;
1917 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1919 6353ad76 2019-02-08 stsp goto done;
1921 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1922 234035bc 2019-06-01 stsp int update_timestamps;
1923 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1924 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1925 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1926 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
1927 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
1928 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1929 eb81bc23 2022-06-28 tracey goto done;
1931 234035bc 2019-06-01 stsp struct got_object_id id2;
1932 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1933 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1936 f69721c3 2019-10-21 stsp goto done;
1938 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1939 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1940 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1941 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1942 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1943 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1944 f69721c3 2019-10-21 stsp goto done;
1946 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1947 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1948 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1949 234035bc 2019-06-01 stsp goto done;
1952 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1953 36bf999c 2020-07-23 stsp char *link_target;
1954 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1956 36bf999c 2020-07-23 stsp goto done;
1957 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1958 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1959 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1960 36bf999c 2020-07-23 stsp free(link_target);
1962 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1963 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1964 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1965 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1967 f69721c3 2019-10-21 stsp free(label_orig);
1968 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1969 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
1970 eb81bc23 2022-06-28 tracey goto done;
1972 234035bc 2019-06-01 stsp if (blob2)
1973 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1975 909d120e 2019-09-22 stsp goto done;
1977 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1978 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1979 234035bc 2019-06-01 stsp * unmodified files again.
1981 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1982 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1983 234035bc 2019-06-01 stsp update_timestamps);
1984 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1985 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1986 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1987 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1988 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1990 1ee397ad 2019-07-12 stsp goto done;
1991 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1992 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1994 13d9040b 2019-03-27 stsp goto done;
1996 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1997 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1998 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1999 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2000 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2001 5267b9e4 2021-09-26 stsp status == GOT_STATUS_UNVERSIONED, 0,
2002 5267b9e4 2021-09-26 stsp repo, progress_cb, progress_arg);
2004 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2005 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2006 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2007 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2008 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2011 13d9040b 2019-03-27 stsp goto done;
2014 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2015 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2016 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2018 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2019 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2020 054041d0 2020-06-24 stsp &blob->id);
2023 13d9040b 2019-03-27 stsp goto done;
2025 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2026 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2027 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2031 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2032 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
2033 eb81bc23 2022-06-28 tracey goto done;
2035 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2037 6353ad76 2019-02-08 stsp free(ondisk_path);
2038 8da9e5f4 2019-01-12 stsp return err;
2041 90285c3b 2019-01-08 stsp static const struct got_error *
2042 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2044 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2045 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2047 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2048 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2050 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2051 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2052 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2054 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2055 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2057 1c4cdd89 2021-06-20 stsp goto done;
2058 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2059 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2060 fddefe3b 2020-10-20 stsp free(ondisk_path);
2061 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2062 1c4cdd89 2021-06-20 stsp parent = NULL;
2063 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2064 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2065 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2066 fddefe3b 2020-10-20 stsp ondisk_path);
2069 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2075 90285c3b 2019-01-08 stsp free(ondisk_path);
2076 1c4cdd89 2021-06-20 stsp free(parent);
2077 90285c3b 2019-01-08 stsp return err;
2080 708d8e67 2019-03-27 stsp static const struct got_error *
2081 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2082 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2083 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2085 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2086 708d8e67 2019-03-27 stsp unsigned char status;
2087 708d8e67 2019-03-27 stsp struct stat sb;
2088 708d8e67 2019-03-27 stsp char *ondisk_path;
2090 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2091 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2093 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2095 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2097 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2099 5a58a424 2020-06-23 stsp goto done;
2101 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2102 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2103 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2104 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2105 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2106 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2107 993e2a1b 2020-07-23 stsp goto done;
2109 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2110 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2111 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2112 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2114 993e2a1b 2020-07-23 stsp goto done;
2115 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2116 993e2a1b 2020-07-23 stsp ie->path);
2117 993e2a1b 2020-07-23 stsp goto done;
2120 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2121 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2122 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2124 5a58a424 2020-06-23 stsp goto done;
2126 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2127 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2129 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2130 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2132 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2134 5a58a424 2020-06-23 stsp goto done;
2135 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2136 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2138 5a58a424 2020-06-23 stsp goto done;
2140 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2143 5a58a424 2020-06-23 stsp free(ondisk_path);
2144 fc6346c4 2019-03-27 stsp return err;
2147 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2148 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2149 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2150 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2151 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2152 8da9e5f4 2019-01-12 stsp void *progress_arg;
2153 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2154 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2157 512f0d0e 2019-01-02 stsp static const struct got_error *
2158 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2159 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2161 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2163 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2164 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2166 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2167 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2170 8da9e5f4 2019-01-12 stsp static const struct got_error *
2171 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2173 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2175 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2176 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2178 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2179 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2182 9d31a1d8 2018-03-11 stsp static const struct got_error *
2183 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2185 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2186 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2187 8da9e5f4 2019-01-12 stsp char *path;
2189 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2190 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2192 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2193 63c5ca5d 2019-08-24 stsp return NULL;
2195 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2196 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2198 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2200 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2201 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2203 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2204 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2206 8da9e5f4 2019-01-12 stsp free(path);
2207 0cd1c46a 2019-03-11 stsp return err;
2210 b2118c49 2020-07-28 stsp const struct got_error *
2211 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2213 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2215 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2216 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2217 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2218 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2221 b2118c49 2020-07-28 stsp return NULL;
2224 818c7501 2019-07-11 stsp static const struct got_error *
2225 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2227 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2228 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2230 517bab73 2019-03-11 stsp *refname = NULL;
2232 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2234 b2118c49 2020-07-28 stsp return err;
2236 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2237 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2238 0647c563 2019-03-11 stsp *refname = NULL;
2240 517bab73 2019-03-11 stsp free(uuidstr);
2241 517bab73 2019-03-11 stsp return err;
2244 818c7501 2019-07-11 stsp const struct got_error *
2245 9587e6cc 2023-01-28 mark got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2246 9587e6cc 2023-01-28 mark const char *prefix)
2248 9587e6cc 2023-01-28 mark return get_ref_name(refname, worktree, prefix);
2251 9587e6cc 2023-01-28 mark const struct got_error *
2252 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2254 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2257 818c7501 2019-07-11 stsp static const struct got_error *
2258 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2260 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2261 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2264 818c7501 2019-07-11 stsp static const struct got_error *
2265 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2267 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2270 818c7501 2019-07-11 stsp static const struct got_error *
2271 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2273 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2274 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2277 818c7501 2019-07-11 stsp static const struct got_error *
2278 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2280 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2281 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2284 0ebf8283 2019-07-24 stsp static const struct got_error *
2285 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2287 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2288 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2291 0ebf8283 2019-07-24 stsp static const struct got_error *
2292 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2294 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2295 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2298 0ebf8283 2019-07-24 stsp static const struct got_error *
2299 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2301 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2302 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2305 0ebf8283 2019-07-24 stsp static const struct got_error *
2306 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2308 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2309 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2312 0ebf8283 2019-07-24 stsp const struct got_error *
2313 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2314 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2316 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2317 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2318 0ebf8283 2019-07-24 stsp *path = NULL;
2319 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2321 0ebf8283 2019-07-24 stsp return NULL;
2324 f259c4c1 2021-09-24 stsp static const struct got_error *
2325 f259c4c1 2021-09-24 stsp get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2327 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2328 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2331 f259c4c1 2021-09-24 stsp static const struct got_error *
2332 f259c4c1 2021-09-24 stsp get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2334 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2335 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2339 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2340 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2342 517bab73 2019-03-11 stsp static const struct got_error *
2343 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2345 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2346 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2347 517bab73 2019-03-11 stsp char *refname;
2349 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2351 517bab73 2019-03-11 stsp return err;
2353 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2355 0cd1c46a 2019-03-11 stsp goto done;
2357 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2359 0cd1c46a 2019-03-11 stsp free(refname);
2361 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2362 3e3a69f1 2019-07-25 stsp return err;
2365 3e3a69f1 2019-07-25 stsp static const struct got_error *
2366 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2368 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2370 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2371 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2372 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2373 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2375 9d31a1d8 2018-03-11 stsp return err;
2379 ebf99748 2019-05-09 stsp static const struct got_error *
2380 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2381 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2383 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2384 ebf99748 2019-05-09 stsp FILE *index = NULL;
2386 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2387 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2388 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2389 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2391 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2393 ebf99748 2019-05-09 stsp goto done;
2395 00fe21f2 2021-12-31 stsp index = fopen(*fileindex_path, "rbe");
2396 ebf99748 2019-05-09 stsp if (index == NULL) {
2397 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2398 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2400 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2401 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2402 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2405 ebf99748 2019-05-09 stsp if (err) {
2406 ebf99748 2019-05-09 stsp free(*fileindex_path);
2407 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2408 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2409 ebf99748 2019-05-09 stsp *fileindex = NULL;
2411 ebf99748 2019-05-09 stsp return err;
2414 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2415 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2416 c932eeeb 2019-05-22 stsp const char *path;
2417 c932eeeb 2019-05-22 stsp size_t path_len;
2418 c932eeeb 2019-05-22 stsp const char *entry_name;
2419 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2420 a484d721 2019-06-10 stsp void *progress_arg;
2423 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2424 c932eeeb 2019-05-22 stsp static const struct got_error *
2425 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2427 1ee397ad 2019-07-12 stsp const struct got_error *err;
2428 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2430 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2431 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2432 c932eeeb 2019-05-22 stsp return NULL;
2433 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2434 102ff934 2019-06-11 stsp return NULL;
2436 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2437 a769b60b 2021-06-27 stsp return NULL;
2439 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2440 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2441 c932eeeb 2019-05-22 stsp return NULL;
2443 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2444 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2445 edd02c5e 2019-07-11 stsp ie->path);
2447 1ee397ad 2019-07-12 stsp return err;
2449 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2450 c932eeeb 2019-05-22 stsp return NULL;
2453 a615e0e7 2020-12-16 stsp static const struct got_error *
2454 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2455 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2456 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2458 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2460 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2461 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2462 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2463 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2464 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2465 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2467 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2468 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2471 9c6338c4 2019-06-02 stsp static const struct got_error *
2472 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2474 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2475 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2476 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2477 867630bb 2020-01-17 stsp struct timespec timeout;
2479 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2480 b90054ed 2022-11-01 stsp fileindex_path, "");
2482 9c6338c4 2019-06-02 stsp goto done;
2484 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2486 9c6338c4 2019-06-02 stsp goto done;
2488 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2489 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2490 9c6338c4 2019-06-02 stsp fileindex_path);
2491 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2495 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2496 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2497 867630bb 2020-01-17 stsp * was recorded in the file index.
2499 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2500 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2501 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2503 9c6338c4 2019-06-02 stsp if (new_index)
2504 9c6338c4 2019-06-02 stsp fclose(new_index);
2505 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2506 9c6338c4 2019-06-02 stsp return err;
2509 6ced4176 2019-07-12 stsp static const struct got_error *
2510 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2511 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2512 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit, struct got_worktree *worktree,
2513 a44927cc 2022-04-07 stsp struct got_repository *repo)
2515 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2516 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2517 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2518 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2520 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2521 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2522 6ced4176 2019-07-12 stsp *tree_id = NULL;
2524 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2525 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2526 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2527 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2528 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2529 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2530 6ced4176 2019-07-12 stsp goto done;
2532 a44927cc 2022-04-07 stsp err = got_object_id_by_path(tree_id, repo, base_commit,
2533 a44927cc 2022-04-07 stsp worktree->path_prefix);
2535 6ced4176 2019-07-12 stsp goto done;
2536 6ced4176 2019-07-12 stsp return NULL;
2539 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2541 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2542 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2543 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2544 6ced4176 2019-07-12 stsp goto done;
2547 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2549 6ced4176 2019-07-12 stsp goto done;
2551 6ced4176 2019-07-12 stsp free(in_repo_path);
2552 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2554 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2556 6ced4176 2019-07-12 stsp goto done;
2558 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2559 6ced4176 2019-07-12 stsp /* Check out a single file. */
2560 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2561 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2562 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2563 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2564 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2565 6ced4176 2019-07-12 stsp goto done;
2567 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2568 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2569 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2570 6ced4176 2019-07-12 stsp goto done;
2573 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2574 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2576 6ced4176 2019-07-12 stsp return err;
2577 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2578 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2579 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2580 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2581 6ced4176 2019-07-12 stsp goto done;
2584 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2585 a44927cc 2022-04-07 stsp base_commit, in_repo_path);
2587 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2588 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2589 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2590 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2591 6ced4176 2019-07-12 stsp goto done;
2593 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2594 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2595 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2596 6ced4176 2019-07-12 stsp goto done;
2601 6ced4176 2019-07-12 stsp free(in_repo_path);
2602 6ced4176 2019-07-12 stsp if (err) {
2603 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2604 6ced4176 2019-07-12 stsp free(*tree_relpath);
2605 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2606 6ced4176 2019-07-12 stsp free(*tree_id);
2607 6ced4176 2019-07-12 stsp *tree_id = NULL;
2609 07ed472d 2019-07-12 stsp return err;
2612 07ed472d 2019-07-12 stsp static const struct got_error *
2613 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2614 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2615 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2616 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2618 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2619 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2620 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2621 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2622 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2624 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2625 7f47418f 2019-12-20 stsp if (err) {
2626 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2627 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2628 7f47418f 2019-12-20 stsp goto done;
2629 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2630 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2632 7f47418f 2019-12-20 stsp return err;
2635 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2636 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2638 07ed472d 2019-07-12 stsp goto done;
2640 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2642 07ed472d 2019-07-12 stsp goto done;
2644 07ed472d 2019-07-12 stsp if (entry_name &&
2645 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2646 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2647 07ed472d 2019-07-12 stsp goto done;
2650 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2651 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2652 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2653 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2654 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2655 07ed472d 2019-07-12 stsp arg.repo = repo;
2656 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2657 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2658 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2659 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2660 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2661 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2664 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2665 07ed472d 2019-07-12 stsp if (commit)
2666 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2667 6ced4176 2019-07-12 stsp return err;
2670 9d31a1d8 2018-03-11 stsp const struct got_error *
2671 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2672 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2673 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2674 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2676 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2677 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2678 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2679 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2680 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2681 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2682 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2683 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2684 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2685 f2ea84fa 2019-07-27 stsp int entry_type;
2686 f2ea84fa 2019-07-27 stsp char *relpath;
2687 f2ea84fa 2019-07-27 stsp char *entry_name;
2688 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2689 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2691 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2693 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2695 9d31a1d8 2018-03-11 stsp return err;
2697 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
2698 a44927cc 2022-04-07 stsp worktree->base_commit_id);
2700 a44927cc 2022-04-07 stsp goto done;
2702 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2703 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2704 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2705 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2706 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2707 f2ea84fa 2019-07-27 stsp goto done;
2710 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2711 a44927cc 2022-04-07 stsp &tpd->relpath, &tpd->tree_id, pe->path, commit,
2712 a44927cc 2022-04-07 stsp worktree, repo);
2713 f2ea84fa 2019-07-27 stsp if (err) {
2714 f2ea84fa 2019-07-27 stsp free(tpd);
2715 6ced4176 2019-07-12 stsp goto done;
2718 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2719 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2720 f2ea84fa 2019-07-27 stsp if (err) {
2721 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2722 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2723 f2ea84fa 2019-07-27 stsp free(tpd);
2724 f2ea84fa 2019-07-27 stsp goto done;
2727 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2729 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2733 51514078 2018-12-25 stsp * Read the file index.
2734 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2735 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2737 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2739 c4cdcb68 2019-04-03 stsp goto done;
2741 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2742 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2743 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2745 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2746 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2747 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2751 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2752 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2753 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2754 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2755 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2756 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2757 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2758 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2762 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2764 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2765 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2766 af12c6b9 2019-06-04 stsp err = sync_err;
2768 9c6338c4 2019-06-02 stsp free(fileindex_path);
2770 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2771 9d31a1d8 2018-03-11 stsp if (commit)
2772 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2773 5ade8233 2019-07-12 stsp if (fileindex)
2774 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2775 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2776 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2777 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2778 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2779 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2780 f2ea84fa 2019-07-27 stsp free(tpd);
2782 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2783 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2784 9d31a1d8 2018-03-11 stsp err = unlockerr;
2785 f8d1f275 2019-02-04 stsp return err;
2788 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2789 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2790 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2791 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2792 234035bc 2019-06-01 stsp void *progress_arg;
2793 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2794 234035bc 2019-06-01 stsp void *cancel_arg;
2795 f69721c3 2019-10-21 stsp const char *label_orig;
2796 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2797 5267b9e4 2021-09-26 stsp int allow_bad_symlinks;
2800 234035bc 2019-06-01 stsp static const struct got_error *
2801 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2802 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
2803 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
2804 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
2805 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2807 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2808 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2809 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2810 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2811 234035bc 2019-06-01 stsp struct stat sb;
2812 234035bc 2019-06-01 stsp unsigned char status;
2813 234035bc 2019-06-01 stsp int local_changes_subsumed;
2814 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2815 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2817 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2818 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2819 d6c87207 2019-08-02 stsp strlen(path2));
2820 1ee397ad 2019-07-12 stsp if (ie == NULL)
2821 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2822 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2824 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2825 234035bc 2019-06-01 stsp path2) == -1)
2826 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2828 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2831 234035bc 2019-06-01 stsp goto done;
2833 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2834 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2835 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2836 234035bc 2019-06-01 stsp goto done;
2838 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2839 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2840 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2841 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2842 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2843 234035bc 2019-06-01 stsp goto done;
2846 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2847 36bf999c 2020-07-23 stsp char *link_target2;
2848 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2850 36bf999c 2020-07-23 stsp goto done;
2851 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2852 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2853 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2854 36bf999c 2020-07-23 stsp free(link_target2);
2858 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2859 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2860 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2861 1af628f4 2021-06-03 stsp goto done;
2863 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2864 1af628f4 2021-06-03 stsp f_orig, blob1);
2866 1af628f4 2021-06-03 stsp goto done;
2868 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2869 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2870 1af628f4 2021-06-03 stsp goto done;
2871 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2872 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2874 1af628f4 2021-06-03 stsp goto done;
2876 c0df5966 2021-12-31 stsp fd = open(ondisk_path,
2877 c0df5966 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2878 1af628f4 2021-06-03 stsp if (fd == -1) {
2879 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2880 1af628f4 2021-06-03 stsp ondisk_path);
2881 1af628f4 2021-06-03 stsp goto done;
2883 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2884 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2885 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2886 1af628f4 2021-06-03 stsp ondisk_path);
2887 1af628f4 2021-06-03 stsp close(fd);
2888 1af628f4 2021-06-03 stsp goto done;
2890 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2892 1af628f4 2021-06-03 stsp goto done;
2893 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2894 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2895 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2896 1af628f4 2021-06-03 stsp goto done;
2898 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2899 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2900 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2901 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2902 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2904 234035bc 2019-06-01 stsp } else if (blob1) {
2905 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2906 d6c87207 2019-08-02 stsp strlen(path1));
2907 1ee397ad 2019-07-12 stsp if (ie == NULL)
2908 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2909 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2911 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2912 2b92fad7 2019-06-02 stsp path1) == -1)
2913 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2915 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2918 2b92fad7 2019-06-02 stsp goto done;
2920 2b92fad7 2019-06-02 stsp switch (status) {
2921 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2922 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2923 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2925 1ee397ad 2019-07-12 stsp goto done;
2926 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2928 2b92fad7 2019-06-02 stsp goto done;
2930 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2932 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2933 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2934 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2935 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2937 1ee397ad 2019-07-12 stsp goto done;
2939 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2941 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2942 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2943 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2944 72840534 2022-01-19 stsp off_t blob1_size;
2946 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2947 0a22ca1a 2020-09-23 stsp * exists in the repository.
2949 72840534 2022-01-19 stsp err = got_object_blob_file_create(&id, &blob1_f,
2950 72840534 2022-01-19 stsp &blob1_size, path1);
2952 0a22ca1a 2020-09-23 stsp goto done;
2953 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2954 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2955 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2957 0a22ca1a 2020-09-23 stsp goto done;
2958 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2961 0a22ca1a 2020-09-23 stsp goto done;
2963 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2966 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2967 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2969 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2970 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2973 0a22ca1a 2020-09-23 stsp goto done;
2976 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2977 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2978 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2979 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2981 1ee397ad 2019-07-12 stsp goto done;
2983 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2984 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2986 1ee397ad 2019-07-12 stsp goto done;
2991 234035bc 2019-06-01 stsp } else if (blob2) {
2992 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2993 234035bc 2019-06-01 stsp path2) == -1)
2994 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2995 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2996 d6c87207 2019-08-02 stsp strlen(path2));
2998 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2999 7f91a133 2019-12-13 stsp -1, NULL, repo);
3001 234035bc 2019-06-01 stsp goto done;
3002 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3003 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3004 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3005 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3006 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3007 1ee397ad 2019-07-12 stsp status, path2);
3008 234035bc 2019-06-01 stsp goto done;
3010 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3011 36bf999c 2020-07-23 stsp char *link_target2;
3012 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3015 36bf999c 2020-07-23 stsp goto done;
3016 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3017 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3018 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3019 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3020 36bf999c 2020-07-23 stsp free(link_target2);
3021 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3022 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3023 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3024 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3025 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3026 526a746f 2020-07-23 stsp a->progress_arg);
3028 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3029 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3032 dfe9fba0 2020-07-23 stsp goto done;
3033 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3034 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3035 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3036 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3038 234035bc 2019-06-01 stsp goto done;
3041 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3042 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3043 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3044 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3045 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3046 5267b9e4 2021-09-26 stsp 0, 1, a->allow_bad_symlinks, repo,
3047 5267b9e4 2021-09-26 stsp a->progress_cb, a->progress_arg);
3049 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3050 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3051 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3054 234035bc 2019-06-01 stsp goto done;
3055 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3057 234035bc 2019-06-01 stsp goto done;
3058 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3059 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3060 3969253a 2020-03-07 stsp if (err) {
3061 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3062 3969253a 2020-03-07 stsp goto done;
3064 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3065 2b92fad7 2019-06-02 stsp if (err) {
3066 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3067 2b92fad7 2019-06-02 stsp goto done;
3069 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3070 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3071 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3076 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3077 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3078 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3079 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3080 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3081 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3082 1af628f4 2021-06-03 stsp free(id_str);
3083 54d5be07 2021-06-03 stsp free(label_deriv2);
3084 234035bc 2019-06-01 stsp free(ondisk_path);
3085 234035bc 2019-06-01 stsp return err;
3088 69de9dd4 2021-09-03 stsp static const struct got_error *
3089 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3091 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3093 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3094 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3095 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3096 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3097 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3099 69de9dd4 2021-09-03 stsp return NULL;
3102 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3103 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3104 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3105 234035bc 2019-06-01 stsp struct got_repository *repo;
3108 234035bc 2019-06-01 stsp static const struct got_error *
3109 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3110 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
3111 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
3112 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
3113 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3115 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3116 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3117 234035bc 2019-06-01 stsp unsigned char status;
3118 234035bc 2019-06-01 stsp struct stat sb;
3119 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3120 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3121 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3122 234035bc 2019-06-01 stsp char *ondisk_path;
3124 69de9dd4 2021-09-03 stsp if (id == NULL)
3125 69de9dd4 2021-09-03 stsp return NULL;
3127 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3128 69de9dd4 2021-09-03 stsp if (ie == NULL)
3129 69de9dd4 2021-09-03 stsp return NULL;
3131 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3133 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3135 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3136 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3137 5546d466 2021-09-02 stsp free(ondisk_path);
3139 234035bc 2019-06-01 stsp return err;
3140 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3141 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3143 234035bc 2019-06-01 stsp return NULL;
3146 818c7501 2019-07-11 stsp static const struct got_error *
3147 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3148 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3149 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3150 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3151 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3153 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3154 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3155 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3156 a44927cc 2022-04-07 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3157 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3158 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3159 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3160 b72706c3 2022-06-01 stsp FILE *f1 = NULL, *f2 = NULL;
3161 f9d37699 2022-06-28 stsp int fd1 = -1, fd2 = -1;
3163 03415a1a 2019-06-02 stsp if (commit_id1) {
3164 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit1, repo, commit_id1);
3166 a44927cc 2022-04-07 stsp goto done;
3167 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id1, repo, commit1,
3168 03415a1a 2019-06-02 stsp worktree->path_prefix);
3169 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3170 03415a1a 2019-06-02 stsp goto done;
3172 69d57f3d 2020-07-31 stsp if (tree_id1) {
3173 69d57f3d 2020-07-31 stsp char *id_str;
3175 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3177 03415a1a 2019-06-02 stsp goto done;
3179 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3181 f69721c3 2019-10-21 stsp goto done;
3183 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3184 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3185 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3186 f69721c3 2019-10-21 stsp free(id_str);
3187 f69721c3 2019-10-21 stsp goto done;
3189 f69721c3 2019-10-21 stsp free(id_str);
3191 b72706c3 2022-06-01 stsp f1 = got_opentemp();
3192 b72706c3 2022-06-01 stsp if (f1 == NULL) {
3193 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3194 b72706c3 2022-06-01 stsp goto done;
3198 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit2, repo, commit_id2);
3200 a44927cc 2022-04-07 stsp goto done;
3202 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id2, repo, commit2,
3203 234035bc 2019-06-01 stsp worktree->path_prefix);
3205 234035bc 2019-06-01 stsp goto done;
3207 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3209 234035bc 2019-06-01 stsp goto done;
3211 b72706c3 2022-06-01 stsp f2 = got_opentemp();
3212 b72706c3 2022-06-01 stsp if (f2 == NULL) {
3213 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3214 f9d37699 2022-06-28 stsp goto done;
3217 f9d37699 2022-06-28 stsp fd1 = got_opentempfd();
3218 f9d37699 2022-06-28 stsp if (fd1 == -1) {
3219 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3220 b72706c3 2022-06-01 stsp goto done;
3223 f9d37699 2022-06-28 stsp fd2 = got_opentempfd();
3224 f9d37699 2022-06-28 stsp if (fd2 == -1) {
3225 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3226 f9d37699 2022-06-28 stsp goto done;
3229 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3230 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3231 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3232 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3233 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3235 69de9dd4 2021-09-03 stsp goto done;
3237 234035bc 2019-06-01 stsp arg.worktree = worktree;
3238 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3239 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3240 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3241 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3242 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3243 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3244 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3245 5267b9e4 2021-09-26 stsp arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3246 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3247 b72706c3 2022-06-01 stsp merge_file_cb, &arg, 1);
3248 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3249 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3250 af12c6b9 2019-06-04 stsp err = sync_err;
3252 a44927cc 2022-04-07 stsp if (commit1)
3253 a44927cc 2022-04-07 stsp got_object_commit_close(commit1);
3254 a44927cc 2022-04-07 stsp if (commit2)
3255 a44927cc 2022-04-07 stsp got_object_commit_close(commit2);
3256 234035bc 2019-06-01 stsp if (tree1)
3257 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3258 234035bc 2019-06-01 stsp if (tree2)
3259 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3260 b72706c3 2022-06-01 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3261 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3262 b72706c3 2022-06-01 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3263 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3264 f9d37699 2022-06-28 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3265 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3266 f9d37699 2022-06-28 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3267 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3268 f69721c3 2019-10-21 stsp free(label_orig);
3269 818c7501 2019-07-11 stsp return err;
3272 818c7501 2019-07-11 stsp const struct got_error *
3273 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3274 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3275 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3276 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3278 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3279 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3280 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3282 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3284 818c7501 2019-07-11 stsp return err;
3286 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3288 818c7501 2019-07-11 stsp goto done;
3290 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3291 69de9dd4 2021-09-03 stsp worktree);
3293 818c7501 2019-07-11 stsp goto done;
3295 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3296 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3297 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3299 818c7501 2019-07-11 stsp if (fileindex)
3300 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3301 818c7501 2019-07-11 stsp free(fileindex_path);
3302 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3303 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3304 234035bc 2019-06-01 stsp err = unlockerr;
3305 234035bc 2019-06-01 stsp return err;
3308 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3309 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3310 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3311 927df6b7 2019-02-10 stsp const char *status_path;
3312 927df6b7 2019-02-10 stsp size_t status_path_len;
3313 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3314 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3315 f8d1f275 2019-02-04 stsp void *status_arg;
3316 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3317 f8d1f275 2019-02-04 stsp void *cancel_arg;
3318 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3319 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3320 f2a9dc41 2019-12-13 tracey int report_unchanged;
3321 3143d852 2020-06-25 stsp int no_ignores;
3324 f8d1f275 2019-02-04 stsp static const struct got_error *
3325 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3326 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3327 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3328 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3330 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3331 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3332 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3333 927df6b7 2019-02-10 stsp struct stat sb;
3334 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3335 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3336 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3338 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3340 98eaaa12 2019-08-03 stsp return err;
3342 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3343 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3344 98eaaa12 2019-08-03 stsp return NULL;
3346 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3347 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3348 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3350 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3351 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3352 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3354 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3355 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3356 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3357 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3358 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3361 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3362 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3365 927df6b7 2019-02-10 stsp static const struct got_error *
3366 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3367 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3369 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3370 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3371 f8d1f275 2019-02-04 stsp char *abspath;
3373 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3374 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3376 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3377 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3378 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3379 927df6b7 2019-02-10 stsp return NULL;
3381 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3382 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3383 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3384 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3386 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3387 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3388 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3391 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3392 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3393 f8d1f275 2019-02-04 stsp free(abspath);
3394 9d31a1d8 2018-03-11 stsp return err;
3397 f8d1f275 2019-02-04 stsp static const struct got_error *
3398 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3400 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3401 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3402 2ec1f75b 2019-03-26 stsp unsigned char status;
3404 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3405 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3407 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3408 927df6b7 2019-02-10 stsp return NULL;
3410 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3411 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3412 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3413 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3415 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3416 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3417 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3421 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3423 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3425 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3426 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3428 d8bacb93 2023-01-10 mark got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3430 d8bacb93 2023-01-10 mark got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3433 6841da00 2019-08-08 stsp static const struct got_error *
3434 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3436 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3437 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3438 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3439 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3440 6841da00 2019-08-08 stsp size_t linesize = 0;
3441 6841da00 2019-08-08 stsp ssize_t linelen;
3443 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3444 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3445 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3446 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3448 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3449 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3450 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3452 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3453 bd8de430 2019-10-04 stsp if (line[0] == '#')
3456 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3457 bd8de430 2019-10-04 stsp if (line[0] == '!')
3460 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3461 6841da00 2019-08-08 stsp line) == -1) {
3462 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3463 6841da00 2019-08-08 stsp goto done;
3465 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3467 6841da00 2019-08-08 stsp goto done;
3469 6841da00 2019-08-08 stsp if (ferror(f)) {
3470 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3471 6841da00 2019-08-08 stsp goto done;
3474 6841da00 2019-08-08 stsp dirpath = strdup(path);
3475 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3476 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3477 6841da00 2019-08-08 stsp goto done;
3479 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3481 6841da00 2019-08-08 stsp free(line);
3482 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3483 6841da00 2019-08-08 stsp free(dirpath);
3484 d8bacb93 2023-01-10 mark got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3486 6841da00 2019-08-08 stsp return err;
3490 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3492 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3494 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3495 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3496 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3497 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3499 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3500 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3502 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3504 bd8de430 2019-10-04 stsp pattern += 3;
3506 bd8de430 2019-10-04 stsp while (*p) {
3507 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3508 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3509 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3510 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3512 bd8de430 2019-10-04 stsp while (*p == '/')
3522 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3523 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3524 6841da00 2019-08-08 stsp * ignores backwards.
3526 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3527 6841da00 2019-08-08 stsp while (pe) {
3528 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3529 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3530 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3531 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3532 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3533 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3534 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3535 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3536 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3541 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3547 6841da00 2019-08-08 stsp static const struct got_error *
3548 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3549 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3551 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3552 6841da00 2019-08-08 stsp char *ignorespath;
3553 886cec17 2019-12-15 stsp int fd = -1;
3554 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3556 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3557 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3558 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3560 886cec17 2019-12-15 stsp if (dirfd != -1) {
3561 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, ignores_filename,
3562 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3563 886cec17 2019-12-15 stsp if (fd == -1) {
3564 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3565 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3566 886cec17 2019-12-15 stsp ignorespath);
3568 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3569 5e91dae4 2022-08-30 stsp if (ignoresfile == NULL)
3570 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3571 886cec17 2019-12-15 stsp ignorespath);
3574 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3578 00fe21f2 2021-12-31 stsp ignoresfile = fopen(ignorespath, "re");
3579 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3580 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3581 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3582 886cec17 2019-12-15 stsp ignorespath);
3584 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3587 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3588 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3589 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3590 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3591 6841da00 2019-08-08 stsp free(ignorespath);
3592 6841da00 2019-08-08 stsp return err;
3595 f8d1f275 2019-02-04 stsp static const struct got_error *
3596 62da3196 2021-10-01 stsp status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3597 62da3196 2021-10-01 stsp int dirfd)
3599 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3600 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3601 f8d1f275 2019-02-04 stsp char *path = NULL;
3603 62da3196 2021-10-01 stsp if (ignore != NULL)
3604 62da3196 2021-10-01 stsp *ignore = 0;
3606 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3607 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3609 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3610 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3611 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3613 f8d1f275 2019-02-04 stsp path = de->d_name;
3616 62da3196 2021-10-01 stsp if (de->d_type == DT_DIR) {
3617 62da3196 2021-10-01 stsp if (!a->no_ignores && ignore != NULL &&
3618 62da3196 2021-10-01 stsp match_ignores(a->ignores, path))
3619 62da3196 2021-10-01 stsp *ignore = 1;
3620 62da3196 2021-10-01 stsp } else if (!match_ignores(a->ignores, path) &&
3621 62da3196 2021-10-01 stsp got_path_is_child(path, a->status_path, a->status_path_len))
3622 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3623 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3624 f8d1f275 2019-02-04 stsp if (parent_path[0])
3625 f8d1f275 2019-02-04 stsp free(path);
3626 b72f483a 2019-02-05 stsp return err;
3629 347d1d3e 2019-07-12 stsp static const struct got_error *
3630 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3632 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3633 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3635 3143d852 2020-06-25 stsp if (a->no_ignores)
3636 3143d852 2020-06-25 stsp return NULL;
3638 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3639 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3641 3143d852 2020-06-25 stsp return err;
3643 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3644 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3646 3143d852 2020-06-25 stsp return err;
3649 3143d852 2020-06-25 stsp static const struct got_error *
3650 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3651 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3652 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3653 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3655 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3656 abb4604f 2019-07-27 stsp struct stat sb;
3658 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3660 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3661 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3663 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3664 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3665 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3666 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3667 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3670 916237f3 2022-02-11 stsp if (!no_ignores && match_ignores(ignores, path))
3671 916237f3 2022-02-11 stsp return NULL;
3673 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3674 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3675 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3677 abb4604f 2019-07-27 stsp return NULL;
3680 3143d852 2020-06-25 stsp static const struct got_error *
3681 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3682 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3684 3143d852 2020-06-25 stsp const struct got_error *err;
3685 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3687 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3688 3143d852 2020-06-25 stsp ".cvsignore");
3690 3143d852 2020-06-25 stsp return err;
3692 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3693 3143d852 2020-06-25 stsp ".gitignore");
3695 3143d852 2020-06-25 stsp return err;
3697 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3698 3143d852 2020-06-25 stsp if (err) {
3699 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3700 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3701 3143d852 2020-06-25 stsp return err;
3703 3143d852 2020-06-25 stsp for (;;) {
3704 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3705 3143d852 2020-06-25 stsp ".cvsignore");
3708 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3709 3143d852 2020-06-25 stsp ".gitignore");
3712 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3713 3143d852 2020-06-25 stsp if (err) {
3714 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3715 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3718 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3720 b737c85a 2020-06-26 stsp free(parent_path);
3721 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3722 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3725 b737c85a 2020-06-26 stsp free(parent_path);
3726 b737c85a 2020-06-26 stsp free(next_parent_path);
3727 3143d852 2020-06-25 stsp return err;
3730 abb4604f 2019-07-27 stsp static const struct got_error *
3731 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3732 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3733 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3734 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3735 f2a9dc41 2019-12-13 tracey int report_unchanged)
3737 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3738 6fc93f37 2019-12-13 stsp int fd = -1;
3739 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3740 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3741 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3742 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3743 a84c0d30 2022-03-12 stsp struct got_fileindex_entry *ie;
3745 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3747 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3748 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3749 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3751 a84c0d30 2022-03-12 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3753 a84c0d30 2022-03-12 stsp err = report_single_file_status(path, ondisk_path,
3754 a84c0d30 2022-03-12 stsp fileindex, status_cb, status_arg, repo,
3755 a84c0d30 2022-03-12 stsp report_unchanged, &ignores, no_ignores);
3756 a84c0d30 2022-03-12 stsp goto done;
3759 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3760 6fc93f37 2019-12-13 stsp if (fd == -1) {
3761 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3762 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
3763 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3765 ff56836b 2021-07-08 stsp if (!no_ignores) {
3766 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3767 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3769 ff56836b 2021-07-08 stsp goto done;
3771 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3772 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3773 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3776 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3777 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3778 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3779 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3780 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3781 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3782 abb4604f 2019-07-27 stsp arg.status_path = path;
3783 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3784 abb4604f 2019-07-27 stsp arg.repo = repo;
3785 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3786 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3787 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3788 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3789 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3790 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3791 022fae89 2019-12-06 tracey if (!no_ignores) {
3792 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3793 3143d852 2020-06-25 stsp worktree->root_path, path);
3795 3143d852 2020-06-25 stsp goto done;
3797 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3798 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3799 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3802 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3803 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3804 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3805 927df6b7 2019-02-10 stsp free(ondisk_path);
3806 347d1d3e 2019-07-12 stsp return err;
3809 347d1d3e 2019-07-12 stsp const struct got_error *
3810 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3811 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3812 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3813 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3815 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3816 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3817 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3818 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3820 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3822 347d1d3e 2019-07-12 stsp return err;
3824 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3825 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3826 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3827 f6343036 2021-06-22 stsp no_ignores, 0);
3831 f8d1f275 2019-02-04 stsp free(fileindex_path);
3832 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3833 f8d1f275 2019-02-04 stsp return err;
3836 6c7ab921 2019-03-18 stsp const struct got_error *
3837 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3838 6c7ab921 2019-03-18 stsp const char *arg)
3840 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3841 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3842 6c7ab921 2019-03-18 stsp size_t len;
3843 00bb5ea0 2020-07-23 stsp struct stat sb;
3844 01740607 2020-11-04 stsp char *abspath = NULL;
3845 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3847 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3849 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3850 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3851 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3853 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3854 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3855 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3856 00bb5ea0 2020-07-23 stsp goto done;
3858 727173c3 2020-11-06 stsp sb.st_mode = 0;
3860 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3862 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3863 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3864 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3865 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3867 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3868 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3869 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3870 00bb5ea0 2020-07-23 stsp goto done;
3874 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3875 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3877 d0710d08 2019-07-22 stsp goto done;
3878 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3879 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3880 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3881 00bb5ea0 2020-07-23 stsp goto done;
3884 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3885 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3886 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3887 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3888 00bb5ea0 2020-07-23 stsp goto done;
3890 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3891 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3892 01740607 2020-11-04 stsp goto done;
3894 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3895 01740607 2020-11-04 stsp sizeof(canonpath));
3897 00bb5ea0 2020-07-23 stsp goto done;
3898 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3899 01740607 2020-11-04 stsp if (resolved == NULL) {
3900 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3901 01740607 2020-11-04 stsp goto done;
3906 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3907 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3908 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3909 6c7ab921 2019-03-18 stsp goto done;
3912 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3913 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3914 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3916 f6d88e1a 2019-05-29 stsp goto done;
3918 f6d88e1a 2019-05-29 stsp path = strdup("");
3919 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3920 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3921 f6d88e1a 2019-05-29 stsp goto done;
3925 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3926 6c7ab921 2019-03-18 stsp len = strlen(path);
3927 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3928 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3932 01740607 2020-11-04 stsp free(abspath);
3933 6c7ab921 2019-03-18 stsp free(resolved);
3934 d0710d08 2019-07-22 stsp free(cwd);
3935 6c7ab921 2019-03-18 stsp if (err == NULL)
3936 6c7ab921 2019-03-18 stsp *wt_path = path;
3938 6c7ab921 2019-03-18 stsp free(path);
3939 d00136be 2019-03-26 stsp return err;
3942 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3943 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3944 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3945 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3946 4e68cba3 2019-11-23 stsp void *progress_arg;
3947 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3950 4e68cba3 2019-11-23 stsp static const struct got_error *
3951 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3952 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3953 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3954 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3956 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3957 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3958 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3959 6d022e97 2019-08-04 stsp struct stat sb;
3960 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3962 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3963 dbb83fbd 2019-12-12 stsp relpath) == -1)
3964 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3966 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3968 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3969 12463d8b 2019-12-13 stsp de_name, a->repo);
3971 dbb83fbd 2019-12-12 stsp goto done;
3972 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3973 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3974 dbb83fbd 2019-12-12 stsp goto done;
3975 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3977 dbb83fbd 2019-12-12 stsp goto done;
3980 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3981 9b4603c0 2022-01-31 stsp if (status == GOT_STATUS_NONEXISTENT)
3982 9b4603c0 2022-01-31 stsp err = got_error_set_errno(ENOENT, ondisk_path);
3984 9b4603c0 2022-01-31 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3985 dbb83fbd 2019-12-12 stsp goto done;
3988 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3990 4e68cba3 2019-11-23 stsp goto done;
3991 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3992 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3993 3969253a 2020-03-07 stsp if (err) {
3994 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3995 3969253a 2020-03-07 stsp goto done;
3997 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3998 07f5b47a 2019-06-02 stsp if (err) {
3999 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
4000 4e68cba3 2019-11-23 stsp goto done;
4003 dbb83fbd 2019-12-12 stsp free(ondisk_path);
4005 dbb83fbd 2019-12-12 stsp return err;
4006 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
4007 dbb83fbd 2019-12-12 stsp return NULL;
4008 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4011 d00136be 2019-03-26 stsp const struct got_error *
4012 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4013 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4014 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4015 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4017 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4018 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4019 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4020 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4021 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4023 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4025 d00136be 2019-03-26 stsp return err;
4027 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4029 d00136be 2019-03-26 stsp goto done;
4031 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4032 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4033 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4034 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4035 4e68cba3 2019-11-23 stsp saa.repo = repo;
4037 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4038 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4039 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4043 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4044 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4045 af12c6b9 2019-06-04 stsp err = sync_err;
4047 fb399478 2019-07-12 stsp free(fileindex_path);
4048 d00136be 2019-03-26 stsp if (fileindex)
4049 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4050 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4051 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4052 d00136be 2019-03-26 stsp err = unlockerr;
4053 6c7ab921 2019-03-18 stsp return err;
4056 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4057 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4058 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4059 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4060 f2a9dc41 2019-12-13 tracey void *progress_arg;
4061 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4062 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4063 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4064 4e12cd97 2022-01-25 stsp int ignore_missing_paths;
4065 766841c2 2020-08-13 stsp const char *status_codes;
4068 f2a9dc41 2019-12-13 tracey static const struct got_error *
4069 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4070 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4071 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4072 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4074 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4075 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4076 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4077 17ed4618 2019-06-02 stsp struct stat sb;
4078 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4080 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_NONEXISTENT) {
4081 4e12cd97 2022-01-25 stsp if (a->ignore_missing_paths)
4082 4e12cd97 2022-01-25 stsp return NULL;
4083 4e12cd97 2022-01-25 stsp return got_error_set_errno(ENOENT, relpath);
4086 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4087 17ed4618 2019-06-02 stsp if (ie == NULL)
4088 692bdcc4 2022-01-25 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4090 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4091 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4092 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4093 9acbc4fa 2019-08-03 stsp return NULL;
4094 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4097 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4098 f2a9dc41 2019-12-13 tracey relpath) == -1)
4099 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4101 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4104 f2a9dc41 2019-12-13 tracey goto done;
4106 766841c2 2020-08-13 stsp if (a->status_codes) {
4107 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4109 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4110 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4113 5e91dae4 2022-08-30 stsp if (i == ncodes) {
4114 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4115 766841c2 2020-08-13 stsp free(ondisk_path);
4116 766841c2 2020-08-13 stsp return NULL;
4118 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4119 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4120 766841c2 2020-08-13 stsp static char msg[64];
4121 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4122 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4123 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4124 766841c2 2020-08-13 stsp goto done;
4128 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4129 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4130 f2a9dc41 2019-12-13 tracey goto done;
4131 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4132 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4133 f2a9dc41 2019-12-13 tracey goto done;
4135 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4136 4e12cd97 2022-01-25 stsp err = got_error_set_errno(ENOENT, relpath);
4137 4e12cd97 2022-01-25 stsp goto done;
4139 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4140 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4141 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4142 f2a9dc41 2019-12-13 tracey goto done;
4146 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4147 20a2ad1c 2020-10-20 stsp size_t root_len;
4149 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4150 a06ca3f7 2022-10-15 stsp if (unlinkat(dirfd, de_name, 0) == -1) {
4151 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4152 12463d8b 2019-12-13 stsp ondisk_path);
4153 12463d8b 2019-12-13 stsp goto done;
4155 a06ca3f7 2022-10-15 stsp } else if (unlink(ondisk_path) == -1) {
4156 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4157 12463d8b 2019-12-13 stsp goto done;
4160 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4162 20a2ad1c 2020-10-20 stsp char *parent;
4163 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4165 2513f20a 2020-10-20 stsp goto done;
4166 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4167 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4168 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4169 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4170 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4171 20a2ad1c 2020-10-20 stsp ondisk_path);
4174 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4175 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4178 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4180 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4181 f2a9dc41 2019-12-13 tracey if (err)
4182 f2a9dc41 2019-12-13 tracey return err;
4183 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4184 f2a9dc41 2019-12-13 tracey return NULL;
4185 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4186 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4189 2ec1f75b 2019-03-26 stsp const struct got_error *
4190 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4191 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4192 766841c2 2020-08-13 stsp const char *status_codes,
4193 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4194 4e12cd97 2022-01-25 stsp struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4196 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4197 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4198 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4199 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4200 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4202 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4204 2ec1f75b 2019-03-26 stsp return err;
4206 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4208 2ec1f75b 2019-03-26 stsp goto done;
4210 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4211 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4212 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4213 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4214 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4215 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4216 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4217 4e12cd97 2022-01-25 stsp sda.ignore_missing_paths = ignore_missing_paths;
4218 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4220 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4221 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4222 62da3196 2021-10-01 stsp schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4226 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4227 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4228 af12c6b9 2019-06-04 stsp err = sync_err;
4230 fb399478 2019-07-12 stsp free(fileindex_path);
4231 2ec1f75b 2019-03-26 stsp if (fileindex)
4232 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4233 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4234 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4235 2ec1f75b 2019-03-26 stsp err = unlockerr;
4236 33aa809d 2019-08-08 stsp return err;
4239 33aa809d 2019-08-08 stsp static const struct got_error *
4240 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4242 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4243 33aa809d 2019-08-08 stsp char *line = NULL;
4244 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4245 33aa809d 2019-08-08 stsp ssize_t linelen;
4247 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4248 33aa809d 2019-08-08 stsp if (linelen == -1) {
4249 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4250 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4251 33aa809d 2019-08-08 stsp goto done;
4253 33aa809d 2019-08-08 stsp return NULL;
4255 33aa809d 2019-08-08 stsp if (outfile) {
4256 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4257 33aa809d 2019-08-08 stsp if (n != linelen) {
4258 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4259 33aa809d 2019-08-08 stsp goto done;
4262 33aa809d 2019-08-08 stsp if (rejectfile) {
4263 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4264 33aa809d 2019-08-08 stsp if (n != linelen)
4265 910d235d 2023-01-10 mark err = got_ferror(rejectfile, GOT_ERR_IO);
4268 33aa809d 2019-08-08 stsp free(line);
4269 2ec1f75b 2019-03-26 stsp return err;
4272 33aa809d 2019-08-08 stsp static const struct got_error *
4273 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4275 33aa809d 2019-08-08 stsp char *line = NULL;
4276 33aa809d 2019-08-08 stsp size_t linesize = 0;
4277 33aa809d 2019-08-08 stsp ssize_t linelen;
4279 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4280 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4281 500467ff 2019-09-25 hiltjo if (ferror(f))
4282 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4283 500467ff 2019-09-25 hiltjo return NULL;
4285 33aa809d 2019-08-08 stsp free(line);
4286 33aa809d 2019-08-08 stsp return NULL;
4289 33aa809d 2019-08-08 stsp static const struct got_error *
4290 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4291 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4292 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4294 33aa809d 2019-08-08 stsp const struct got_error *err;
4296 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4297 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4298 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4300 33aa809d 2019-08-08 stsp return err;
4301 33aa809d 2019-08-08 stsp (*line_cur1)++;
4303 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4304 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4305 33aa809d 2019-08-08 stsp if (rejectfile)
4306 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4308 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4310 33aa809d 2019-08-08 stsp return err;
4311 33aa809d 2019-08-08 stsp (*line_cur2)++;
4313 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4314 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4315 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4317 33aa809d 2019-08-08 stsp return err;
4318 33aa809d 2019-08-08 stsp (*line_cur2)++;
4320 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4321 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4322 33aa809d 2019-08-08 stsp if (rejectfile)
4323 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4325 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4327 33aa809d 2019-08-08 stsp return err;
4328 33aa809d 2019-08-08 stsp (*line_cur1)++;
4331 f1e81a05 2019-08-10 stsp return NULL;
4334 f1e81a05 2019-08-10 stsp static const struct got_error *
4335 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4336 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4338 f1e81a05 2019-08-10 stsp const struct got_error *err;
4340 f1e81a05 2019-08-10 stsp if (outfile) {
4341 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4342 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4343 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4345 f1e81a05 2019-08-10 stsp return err;
4346 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4349 f1e81a05 2019-08-10 stsp if (rejectfile) {
4350 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4351 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4352 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4354 f1e81a05 2019-08-10 stsp return err;
4355 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4359 33aa809d 2019-08-08 stsp return NULL;
4362 33aa809d 2019-08-08 stsp static const struct got_error *
4363 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4364 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4365 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4366 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4367 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4369 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4370 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4371 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4372 33aa809d 2019-08-08 stsp FILE *hunkfile;
4373 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4374 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4377 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4379 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4380 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4381 fe621944 2020-11-10 stsp start_old = cc.left.start;
4382 fe621944 2020-11-10 stsp end_old = cc.left.end;
4383 fe621944 2020-11-10 stsp start_new = cc.right.start;
4384 fe621944 2020-11-10 stsp end_new = cc.right.end;
4386 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4387 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4388 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4390 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4391 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4392 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4394 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4395 fe621944 2020-11-10 stsp if (diff_state == NULL)
4396 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4397 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4399 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4400 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4401 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4402 33aa809d 2019-08-08 stsp goto done;
4405 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4406 fe621944 2020-11-10 stsp diff_result, &cc);
4407 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4408 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4409 33aa809d 2019-08-08 stsp goto done;
4412 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4413 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4414 33aa809d 2019-08-08 stsp goto done;
4417 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4418 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4420 33aa809d 2019-08-08 stsp goto done;
4422 33aa809d 2019-08-08 stsp switch (*choice) {
4423 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4424 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4425 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4427 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4428 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4429 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4431 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4434 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4438 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4439 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4440 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4441 33aa809d 2019-08-08 stsp return err;
4444 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4445 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4446 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4447 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4448 1f1abb7e 2019-08-08 stsp void *progress_arg;
4449 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4450 33aa809d 2019-08-08 stsp void *patch_arg;
4451 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4452 f259c4c1 2021-09-24 stsp int unlink_added_files;
4455 e20a8b6f 2019-06-04 stsp static const struct got_error *
4456 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4457 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4458 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4459 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4460 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4462 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4463 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4464 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4465 eb81bc23 2022-06-28 tracey int fd = -1, fd2 = -1;
4466 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4467 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4468 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4469 fe621944 2020-11-10 stsp struct stat sb2;
4470 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4471 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4472 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4474 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4476 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4478 33aa809d 2019-08-08 stsp return err;
4480 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4481 e7ae0baf 2021-12-31 stsp fd2 = openat(dirfd2, de_name2,
4482 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4483 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4484 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4485 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4486 fa3cef63 2020-07-23 stsp goto done;
4488 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4489 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4490 c0df5966 2021-12-31 stsp if (link_len == -1) {
4491 c0df5966 2021-12-31 stsp return got_error_from_errno2("readlinkat",
4494 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4495 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4498 8bd0cdad 2021-12-31 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4499 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4500 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4501 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4502 fa3cef63 2020-07-23 stsp goto done;
4504 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4505 fa3cef63 2020-07-23 stsp sizeof(link_target));
4506 fa3cef63 2020-07-23 stsp if (link_len == -1)
4507 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4508 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4509 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4512 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4513 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4514 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4515 fa3cef63 2020-07-23 stsp goto done;
4518 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4519 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4520 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4521 fa3cef63 2020-07-23 stsp goto done;
4526 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4527 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4528 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4529 fa3cef63 2020-07-23 stsp goto done;
4531 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4532 fa3cef63 2020-07-23 stsp if (n != link_len) {
4533 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4534 fa3cef63 2020-07-23 stsp goto done;
4536 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4537 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4538 fa3cef63 2020-07-23 stsp goto done;
4540 fa3cef63 2020-07-23 stsp rewind(f2);
4543 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4544 eb81bc23 2022-06-28 tracey if (fd == -1) {
4545 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4546 eb81bc23 2022-06-28 tracey goto done;
4549 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4551 33aa809d 2019-08-08 stsp goto done;
4553 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4555 33aa809d 2019-08-08 stsp goto done;
4557 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4559 33aa809d 2019-08-08 stsp goto done;
4561 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4562 4b752015 2022-06-30 stsp 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4564 33aa809d 2019-08-08 stsp goto done;
4566 b90054ed 2022-11-01 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4569 33aa809d 2019-08-08 stsp goto done;
4571 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4572 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4573 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4574 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4576 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4577 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4578 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4579 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4580 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4581 fe621944 2020-11-10 stsp nchanges++;
4583 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4584 33aa809d 2019-08-08 stsp int choice;
4585 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4586 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4587 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4588 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4589 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4590 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4592 33aa809d 2019-08-08 stsp goto done;
4593 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4594 33aa809d 2019-08-08 stsp have_content = 1;
4595 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4598 1ebedb77 2019-10-19 stsp if (have_content) {
4599 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4600 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4601 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4603 1ebedb77 2019-10-19 stsp goto done;
4605 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4606 b2b3fce1 2022-10-29 op mode_t mode;
4608 b2b3fce1 2022-10-29 op mode = apply_umask(sb2.st_mode);
4609 b2b3fce1 2022-10-29 op if (fchmod(fileno(outfile), mode) == -1) {
4610 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4611 fa3cef63 2020-07-23 stsp goto done;
4616 33aa809d 2019-08-08 stsp free(id_str);
4617 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4618 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4620 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4621 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4622 fe621944 2020-11-10 stsp if (err == NULL)
4623 fe621944 2020-11-10 stsp err = free_err;
4624 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4625 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4626 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4627 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4628 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4629 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4630 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4631 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4632 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4633 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4634 33aa809d 2019-08-08 stsp if (err || !have_content) {
4635 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4636 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4637 33aa809d 2019-08-08 stsp free(*path_outfile);
4638 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4640 33aa809d 2019-08-08 stsp free(path1);
4641 33aa809d 2019-08-08 stsp return err;
4644 33aa809d 2019-08-08 stsp static const struct got_error *
4645 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4646 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4647 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4648 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4650 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4651 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4652 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4653 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4654 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit = NULL;
4655 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4656 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4657 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4658 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4659 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4660 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4661 eb81bc23 2022-06-28 tracey int fd = -1;
4663 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4664 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4665 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4666 d3bcc3d1 2019-08-08 stsp return NULL;
4668 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4669 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4670 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4672 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4673 65084dad 2019-08-08 stsp if (ie == NULL)
4674 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4676 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4677 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4678 a129376b 2019-03-28 stsp if (err) {
4679 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4680 a129376b 2019-03-28 stsp goto done;
4681 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4682 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4683 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4684 e20a8b6f 2019-06-04 stsp goto done;
4687 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4688 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4689 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4690 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4691 a129376b 2019-03-28 stsp goto done;
4694 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4695 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4696 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4697 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4698 a129376b 2019-03-28 stsp goto done;
4701 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4702 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4703 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4704 a129376b 2019-03-28 stsp goto done;
4709 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&base_commit, a->repo,
4710 a44927cc 2022-04-07 stsp a->worktree->base_commit_id);
4712 a44927cc 2022-04-07 stsp goto done;
4714 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4715 a9fa2909 2019-07-27 stsp if (err) {
4716 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4717 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4718 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4719 a9fa2909 2019-07-27 stsp goto done;
4721 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4723 a9fa2909 2019-07-27 stsp goto done;
4725 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4727 a9fa2909 2019-07-27 stsp goto done;
4729 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4730 1233e6b6 2020-10-19 stsp free(te_name);
4731 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4732 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4733 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4734 a9fa2909 2019-07-27 stsp goto done;
4738 a129376b 2019-03-28 stsp switch (status) {
4739 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4740 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4741 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4742 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4743 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4745 33aa809d 2019-08-08 stsp goto done;
4746 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4749 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4750 1f1abb7e 2019-08-08 stsp ie->path);
4752 1ee397ad 2019-07-12 stsp goto done;
4753 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4754 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4755 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4756 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4757 f259c4c1 2021-09-24 stsp relpath) == -1) {
4758 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4759 f259c4c1 2021-09-24 stsp goto done;
4761 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4762 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4763 f259c4c1 2021-09-24 stsp ondisk_path);
4768 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4769 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4770 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4771 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4772 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4774 33aa809d 2019-08-08 stsp goto done;
4775 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4778 33aa809d 2019-08-08 stsp /* fall through */
4779 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4780 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4781 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4782 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4783 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4784 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4785 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4786 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4787 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4789 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4790 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4791 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4792 eb81bc23 2022-06-28 tracey if (fd == -1) {
4793 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4794 eb81bc23 2022-06-28 tracey goto done;
4797 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4799 65084dad 2019-08-08 stsp goto done;
4801 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4802 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4803 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4804 a129376b 2019-03-28 stsp goto done;
4807 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4808 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4809 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4810 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4811 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4812 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4813 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4815 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4816 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4817 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4818 369fd7e5 2020-07-23 stsp path_content);
4821 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4822 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4823 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4824 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4826 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4827 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4828 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4829 369fd7e5 2020-07-23 stsp goto done;
4833 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4834 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4835 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4836 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4837 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4838 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4840 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4842 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4843 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4844 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4845 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4848 a129376b 2019-03-28 stsp goto done;
4849 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4850 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4851 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4852 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4853 437adc9d 2020-12-10 yzhong blob->id.sha1,
4854 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4856 2e1fa222 2020-07-23 stsp goto done;
4858 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4859 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4860 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4869 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4870 33aa809d 2019-08-08 stsp free(path_content);
4871 e20a8b6f 2019-06-04 stsp free(parent_path);
4872 a129376b 2019-03-28 stsp free(tree_path);
4873 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4874 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4876 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4878 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4879 a129376b 2019-03-28 stsp free(tree_id);
4880 a44927cc 2022-04-07 stsp if (base_commit)
4881 a44927cc 2022-04-07 stsp got_object_commit_close(base_commit);
4882 e20a8b6f 2019-06-04 stsp return err;
4885 e20a8b6f 2019-06-04 stsp const struct got_error *
4886 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4887 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4888 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4889 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4890 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4892 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4893 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4894 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4895 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4896 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4897 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4899 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4901 e20a8b6f 2019-06-04 stsp return err;
4903 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4905 e20a8b6f 2019-06-04 stsp goto done;
4907 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4908 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4909 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4910 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4911 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4912 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4913 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4914 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4915 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4916 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4917 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
4921 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4922 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4923 e20a8b6f 2019-06-04 stsp err = sync_err;
4925 fb399478 2019-07-12 stsp free(fileindex_path);
4926 a129376b 2019-03-28 stsp if (fileindex)
4927 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4928 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4929 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4930 a129376b 2019-03-28 stsp err = unlockerr;
4931 c4296144 2019-05-09 stsp return err;
4934 cf066bf8 2019-05-09 stsp static void
4935 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4937 24519714 2019-05-09 stsp free(ct->path);
4938 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4939 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4940 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4941 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4942 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4943 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4947 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4948 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4949 24519714 2019-05-09 stsp struct got_repository *repo;
4950 24519714 2019-05-09 stsp struct got_worktree *worktree;
4951 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4952 5f8a88c6 2019-08-03 stsp int have_staged_files;
4953 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4954 2a47b1e5 2022-11-01 stsp int diff_header_shown;
4955 2a47b1e5 2022-11-01 stsp FILE *diff_outfile;
4961 2a47b1e5 2022-11-01 stsp * Create a file which contains the target path of a symlink so we can feed
4962 2a47b1e5 2022-11-01 stsp * it as content to the diff engine.
4964 2a47b1e5 2022-11-01 stsp static const struct got_error *
4965 2a47b1e5 2022-11-01 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4966 2a47b1e5 2022-11-01 stsp const char *abspath)
4968 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
4969 2a47b1e5 2022-11-01 stsp char target_path[PATH_MAX];
4970 2a47b1e5 2022-11-01 stsp ssize_t target_len, outlen;
4974 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
4975 2a47b1e5 2022-11-01 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4976 2a47b1e5 2022-11-01 stsp if (target_len == -1)
4977 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlinkat", abspath);
4979 2a47b1e5 2022-11-01 stsp target_len = readlink(abspath, target_path, PATH_MAX);
4980 2a47b1e5 2022-11-01 stsp if (target_len == -1)
4981 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlink", abspath);
4984 2a47b1e5 2022-11-01 stsp *fd = got_opentempfd();
4985 2a47b1e5 2022-11-01 stsp if (*fd == -1)
4986 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentempfd");
4988 2a47b1e5 2022-11-01 stsp outlen = write(*fd, target_path, target_len);
4989 2a47b1e5 2022-11-01 stsp if (outlen == -1) {
4990 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
4991 2a47b1e5 2022-11-01 stsp goto done;
4994 2a47b1e5 2022-11-01 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
4995 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("lseek", abspath);
4996 2a47b1e5 2022-11-01 stsp goto done;
4999 2a47b1e5 2022-11-01 stsp if (err) {
5000 2a47b1e5 2022-11-01 stsp close(*fd);
5003 2a47b1e5 2022-11-01 stsp return err;
5006 2a47b1e5 2022-11-01 stsp static const struct got_error *
5007 2a47b1e5 2022-11-01 stsp append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5008 2a47b1e5 2022-11-01 stsp FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5009 6d15dc69 2022-11-01 stsp int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5011 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
5012 2a47b1e5 2022-11-01 stsp struct got_blob_object *blob1 = NULL;
5013 2a47b1e5 2022-11-01 stsp int fd = -1, fd1 = -1, fd2 = -1;
5014 2a47b1e5 2022-11-01 stsp FILE *ondisk_file = NULL;
5015 2a47b1e5 2022-11-01 stsp char *label1 = NULL;
5016 2a47b1e5 2022-11-01 stsp struct stat sb;
5017 2a47b1e5 2022-11-01 stsp off_t size1 = 0;
5018 2a47b1e5 2022-11-01 stsp int f2_exists = 0;
5019 2a47b1e5 2022-11-01 stsp char *id_str = NULL;
5021 2a47b1e5 2022-11-01 stsp memset(&sb, 0, sizeof(sb));
5023 4ba5cca9 2022-11-01 stsp if (diff_staged) {
5024 4ba5cca9 2022-11-01 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5025 4ba5cca9 2022-11-01 stsp ct->staged_status != GOT_STATUS_ADD &&
5026 4ba5cca9 2022-11-01 stsp ct->staged_status != GOT_STATUS_DELETE)
5027 4ba5cca9 2022-11-01 stsp return NULL;
5029 4ba5cca9 2022-11-01 stsp if (ct->status != GOT_STATUS_MODIFY &&
5030 4ba5cca9 2022-11-01 stsp ct->status != GOT_STATUS_ADD &&
5031 4ba5cca9 2022-11-01 stsp ct->status != GOT_STATUS_DELETE)
5032 4ba5cca9 2022-11-01 stsp return NULL;
5035 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f1);
5037 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5038 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f2);
5040 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5042 2a47b1e5 2022-11-01 stsp if (!*diff_header_shown) {
5043 2a47b1e5 2022-11-01 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
5045 2a47b1e5 2022-11-01 stsp return err;
5046 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5047 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree));
5048 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "commit - %s\n", id_str);
5049 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "path + %s%s\n",
5050 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree),
5051 2a47b1e5 2022-11-01 stsp diff_staged ? " (staged changes)" : "");
5052 2a47b1e5 2022-11-01 stsp *diff_header_shown = 1;
5055 2a47b1e5 2022-11-01 stsp if (diff_staged) {
5056 2a47b1e5 2022-11-01 stsp const char *label1 = NULL, *label2 = NULL;
5057 2a47b1e5 2022-11-01 stsp switch (ct->staged_status) {
5058 2a47b1e5 2022-11-01 stsp case GOT_STATUS_MODIFY:
5059 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5060 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5062 2a47b1e5 2022-11-01 stsp case GOT_STATUS_ADD:
5063 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5065 2a47b1e5 2022-11-01 stsp case GOT_STATUS_DELETE:
5066 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5069 2a47b1e5 2022-11-01 stsp return got_error(GOT_ERR_FILE_STATUS);
5071 2a47b1e5 2022-11-01 stsp fd1 = got_opentempfd();
5072 2a47b1e5 2022-11-01 stsp if (fd1 == -1) {
5073 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5074 2a47b1e5 2022-11-01 stsp goto done;
5076 2a47b1e5 2022-11-01 stsp fd2 = got_opentempfd();
5077 2a47b1e5 2022-11-01 stsp if (fd2 == -1) {
5078 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5079 2a47b1e5 2022-11-01 stsp goto done;
5081 2a47b1e5 2022-11-01 stsp err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5082 2a47b1e5 2022-11-01 stsp fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5083 1f3405c9 2023-01-17 mark label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5084 a76e88e5 2023-01-10 mark NULL, repo, diff_outfile);
5085 2a47b1e5 2022-11-01 stsp goto done;
5088 2a47b1e5 2022-11-01 stsp fd1 = got_opentempfd();
5089 2a47b1e5 2022-11-01 stsp if (fd1 == -1) {
5090 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5091 2a47b1e5 2022-11-01 stsp goto done;
5094 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_ADD) {
5095 2a47b1e5 2022-11-01 stsp err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5096 2a47b1e5 2022-11-01 stsp 8192, fd1);
5098 2a47b1e5 2022-11-01 stsp goto done;
5101 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_DELETE) {
5102 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
5103 2a47b1e5 2022-11-01 stsp fd = openat(dirfd, de_name,
5104 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5105 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5106 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5107 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("openat",
5108 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5109 2a47b1e5 2022-11-01 stsp goto done;
5111 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5112 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5114 2a47b1e5 2022-11-01 stsp goto done;
5117 2a47b1e5 2022-11-01 stsp fd = open(ct->ondisk_path,
5118 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5119 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5120 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5121 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("open",
5122 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5123 2a47b1e5 2022-11-01 stsp goto done;
5125 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5126 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5128 2a47b1e5 2022-11-01 stsp goto done;
5131 2a47b1e5 2022-11-01 stsp if (fstatat(fd, ct->ondisk_path, &sb,
5132 2a47b1e5 2022-11-01 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5133 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fstatat", ct->ondisk_path);
5134 2a47b1e5 2022-11-01 stsp goto done;
5136 2a47b1e5 2022-11-01 stsp ondisk_file = fdopen(fd, "r");
5137 2a47b1e5 2022-11-01 stsp if (ondisk_file == NULL) {
5138 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fdopen", ct->ondisk_path);
5139 2a47b1e5 2022-11-01 stsp goto done;
5142 2a47b1e5 2022-11-01 stsp f2_exists = 1;
5145 2a47b1e5 2022-11-01 stsp if (blob1) {
5146 2a47b1e5 2022-11-01 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5147 2a47b1e5 2022-11-01 stsp f1, blob1);
5149 2a47b1e5 2022-11-01 stsp goto done;
5152 2a47b1e5 2022-11-01 stsp err = got_diff_blob_file(blob1, f1, size1, label1,
5153 2a47b1e5 2022-11-01 stsp ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5154 1f3405c9 2023-01-17 mark GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5156 2a47b1e5 2022-11-01 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5157 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5158 2a47b1e5 2022-11-01 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5159 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5160 2a47b1e5 2022-11-01 stsp if (blob1)
5161 2a47b1e5 2022-11-01 stsp got_object_blob_close(blob1);
5162 2a47b1e5 2022-11-01 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5163 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5164 2a47b1e5 2022-11-01 stsp if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5165 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
5166 2a47b1e5 2022-11-01 stsp return err;
5169 c4296144 2019-05-09 stsp static const struct got_error *
5170 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
5171 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
5172 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5173 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
5175 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
5176 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
5177 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5178 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
5179 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
5180 768aea60 2019-05-09 stsp struct stat sb;
5182 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
5183 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
5184 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
5185 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5186 5f8a88c6 2019-08-03 stsp return NULL;
5188 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
5189 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
5191 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
5192 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
5193 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
5194 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
5195 5f8a88c6 2019-08-03 stsp return NULL;
5198 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
5199 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5200 036813ee 2019-05-09 stsp goto done;
5202 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
5203 036813ee 2019-05-09 stsp parent_path = strdup("");
5204 69960a46 2019-05-09 stsp if (parent_path == NULL)
5205 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
5207 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
5209 69960a46 2019-05-09 stsp return err;
5212 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
5213 cf066bf8 2019-05-09 stsp if (ct == NULL) {
5214 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
5215 c4296144 2019-05-09 stsp goto done;
5218 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5219 768aea60 2019-05-09 stsp relpath) == -1) {
5220 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5221 768aea60 2019-05-09 stsp goto done;
5224 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
5225 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
5226 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
5227 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5228 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
5229 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
5230 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
5231 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
5233 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
5234 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
5237 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5238 0aeb8099 2020-07-23 stsp goto done;
5240 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
5241 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
5242 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
5243 12463d8b 2019-12-13 stsp if (dirfd != -1) {
5244 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
5245 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5246 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
5247 12463d8b 2019-12-13 stsp ct->ondisk_path);
5248 12463d8b 2019-12-13 stsp goto done;
5250 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
5251 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
5252 768aea60 2019-05-09 stsp goto done;
5254 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5257 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5258 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5259 44d03001 2019-05-09 stsp relpath) == -1) {
5260 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5261 44d03001 2019-05-09 stsp goto done;
5264 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5265 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5266 35213c7c 2020-07-23 stsp int is_bad_symlink;
5267 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5268 35213c7c 2020-07-23 stsp ssize_t target_len;
5269 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5270 35213c7c 2020-07-23 stsp sizeof(target_path));
5271 35213c7c 2020-07-23 stsp if (target_len == -1) {
5272 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5273 35213c7c 2020-07-23 stsp ct->ondisk_path);
5274 35213c7c 2020-07-23 stsp goto done;
5276 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5277 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5279 35213c7c 2020-07-23 stsp goto done;
5280 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5281 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5282 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5283 35213c7c 2020-07-23 stsp goto done;
5288 cf066bf8 2019-05-09 stsp ct->status = status;
5289 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5290 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5291 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5292 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5293 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5294 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5295 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5296 b416585c 2019-05-13 stsp goto done;
5298 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5299 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5300 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5301 f0b75401 2019-08-03 stsp goto done;
5304 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5305 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5306 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5307 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5308 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5309 036813ee 2019-05-09 stsp goto done;
5312 24519714 2019-05-09 stsp ct->path = strdup(path);
5313 24519714 2019-05-09 stsp if (ct->path == NULL) {
5314 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5315 24519714 2019-05-09 stsp goto done;
5317 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5319 2a47b1e5 2022-11-01 stsp goto done;
5321 2a47b1e5 2022-11-01 stsp if (a->diff_outfile && ct && new != NULL) {
5322 2a47b1e5 2022-11-01 stsp err = append_ct_diff(ct, &a->diff_header_shown,
5323 2a47b1e5 2022-11-01 stsp a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5324 6d15dc69 2022-11-01 stsp a->have_staged_files, a->repo, a->worktree);
5326 2a47b1e5 2022-11-01 stsp goto done;
5329 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5330 ed175427 2019-05-09 stsp free_commitable(ct);
5331 24519714 2019-05-09 stsp free(parent_path);
5332 036813ee 2019-05-09 stsp free(path);
5333 a129376b 2019-03-28 stsp return err;
5336 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5337 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5338 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5339 036813ee 2019-05-09 stsp struct got_repository *);
5341 ed175427 2019-05-09 stsp static const struct got_error *
5342 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5343 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5344 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5345 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5346 afa376bf 2019-05-09 stsp struct got_repository *repo)
5348 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5349 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5350 036813ee 2019-05-09 stsp char *subpath;
5352 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5353 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5354 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5356 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5358 ed175427 2019-05-09 stsp return err;
5360 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5361 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5362 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5363 036813ee 2019-05-09 stsp free(subpath);
5364 036813ee 2019-05-09 stsp return err;
5367 036813ee 2019-05-09 stsp static const struct got_error *
5368 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5370 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5371 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5373 036813ee 2019-05-09 stsp *match = 0;
5375 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5376 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5377 0f63689d 2019-05-10 stsp return NULL;
5380 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5382 0f63689d 2019-05-10 stsp return err;
5383 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5384 036813ee 2019-05-09 stsp free(ct_parent_path);
5385 036813ee 2019-05-09 stsp return err;
5388 768aea60 2019-05-09 stsp static mode_t
5389 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5391 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5392 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5394 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5397 036813ee 2019-05-09 stsp static const struct got_error *
5398 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5399 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5401 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5403 036813ee 2019-05-09 stsp *new_te = NULL;
5405 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5407 036813ee 2019-05-09 stsp goto done;
5409 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5411 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5412 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5413 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5415 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5417 036813ee 2019-05-09 stsp if (err && *new_te) {
5418 56e0773d 2019-11-28 stsp free(*new_te);
5419 036813ee 2019-05-09 stsp *new_te = NULL;
5421 036813ee 2019-05-09 stsp return err;
5424 036813ee 2019-05-09 stsp static const struct got_error *
5425 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5426 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5428 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5429 102b254e 2020-10-19 stsp char *ct_name = NULL;
5431 036813ee 2019-05-09 stsp *new_te = NULL;
5433 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5434 036813ee 2019-05-09 stsp if (*new_te == NULL)
5435 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5437 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5439 036813ee 2019-05-09 stsp goto done;
5440 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5441 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5442 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5443 036813ee 2019-05-09 stsp goto done;
5446 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5448 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5449 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5450 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5452 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5454 102b254e 2020-10-19 stsp free(ct_name);
5455 036813ee 2019-05-09 stsp if (err && *new_te) {
5456 56e0773d 2019-11-28 stsp free(*new_te);
5457 036813ee 2019-05-09 stsp *new_te = NULL;
5459 036813ee 2019-05-09 stsp return err;
5462 036813ee 2019-05-09 stsp static const struct got_error *
5463 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5464 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5466 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5467 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5469 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5471 036813ee 2019-05-09 stsp return err;
5472 036813ee 2019-05-09 stsp if (new_pe == NULL)
5473 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5474 036813ee 2019-05-09 stsp return NULL;
5477 afa376bf 2019-05-09 stsp static const struct got_error *
5478 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5479 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5481 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5482 5f8a88c6 2019-08-03 stsp unsigned char status;
5484 0ff8d236 2021-09-28 stsp if (status_cb == NULL) /* no commit progress output desired */
5485 0ff8d236 2021-09-28 stsp return NULL;
5487 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5488 afa376bf 2019-05-09 stsp ct_path++;
5490 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5491 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5493 5f8a88c6 2019-08-03 stsp status = ct->status;
5495 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5496 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5499 036813ee 2019-05-09 stsp static const struct got_error *
5500 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5501 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5503 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5504 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5505 44d03001 2019-05-09 stsp char *te_path;
5507 44d03001 2019-05-09 stsp *modified = 0;
5509 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5510 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5511 44d03001 2019-05-09 stsp te->name) == -1)
5512 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5514 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5515 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5516 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5517 44d03001 2019-05-09 stsp strlen(te_path));
5518 62d463ca 2020-10-20 naddy if (*modified)
5522 44d03001 2019-05-09 stsp free(te_path);
5523 44d03001 2019-05-09 stsp return err;
5526 44d03001 2019-05-09 stsp static const struct got_error *
5527 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5528 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5529 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5531 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5532 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5534 036813ee 2019-05-09 stsp *ctp = NULL;
5536 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5537 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5538 036813ee 2019-05-09 stsp char *ct_name = NULL;
5539 036813ee 2019-05-09 stsp int path_matches;
5541 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5542 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5543 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5544 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5547 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5548 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5552 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5555 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5557 036813ee 2019-05-09 stsp return err;
5558 036813ee 2019-05-09 stsp if (!path_matches)
5561 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5563 d34b633e 2020-10-19 stsp return err;
5565 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5566 d34b633e 2020-10-19 stsp free(ct_name);
5569 d34b633e 2020-10-19 stsp free(ct_name);
5571 036813ee 2019-05-09 stsp *ctp = ct;
5575 2b496619 2019-07-10 stsp return err;
5578 2b496619 2019-07-10 stsp static const struct got_error *
5579 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5580 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5581 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5582 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5583 2b496619 2019-07-10 stsp struct got_repository *repo)
5585 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5586 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5587 2b496619 2019-07-10 stsp char *subtree_path;
5588 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5589 ba580f68 2020-03-22 stsp int nentries;
5591 2b496619 2019-07-10 stsp *new_tep = NULL;
5593 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5594 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5595 2b496619 2019-07-10 stsp child_path) == -1)
5596 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5598 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5599 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5600 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5601 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5603 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5604 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5605 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5606 2b496619 2019-07-10 stsp goto done;
5608 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5609 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5610 2b496619 2019-07-10 stsp if (err) {
5611 56e0773d 2019-11-28 stsp free(new_te);
5612 2b496619 2019-07-10 stsp goto done;
5614 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5617 2b496619 2019-07-10 stsp free(subtree_path);
5618 2b496619 2019-07-10 stsp if (err == NULL)
5619 2b496619 2019-07-10 stsp *new_tep = new_te;
5620 036813ee 2019-05-09 stsp return err;
5623 036813ee 2019-05-09 stsp static const struct got_error *
5624 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5625 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5626 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5627 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5628 036813ee 2019-05-09 stsp struct got_repository *repo)
5630 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5631 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5632 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5633 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5635 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5636 ba580f68 2020-03-22 stsp *nentries = 0;
5638 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5639 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5640 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5641 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5643 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5644 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5645 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5648 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5649 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5652 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5653 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5655 036813ee 2019-05-09 stsp goto done;
5657 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5658 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5659 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5661 036813ee 2019-05-09 stsp goto done;
5662 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5664 afa376bf 2019-05-09 stsp goto done;
5665 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5666 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5668 2f51b5b3 2019-05-09 stsp goto done;
5669 ba580f68 2020-03-22 stsp (*nentries)++;
5671 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5672 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5673 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5674 2b496619 2019-07-10 stsp == NULL) {
5675 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5676 2b496619 2019-07-10 stsp child_path, path_base_tree,
5677 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5680 2b496619 2019-07-10 stsp goto done;
5681 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5683 2b496619 2019-07-10 stsp goto done;
5684 ba580f68 2020-03-22 stsp (*nentries)++;
5689 2f51b5b3 2019-05-09 stsp if (base_tree) {
5690 56e0773d 2019-11-28 stsp int i, nbase_entries;
5691 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5692 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5693 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5694 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5696 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5697 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5698 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5699 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5701 63c5ca5d 2019-08-24 stsp goto done;
5702 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5704 63c5ca5d 2019-08-24 stsp goto done;
5705 ba580f68 2020-03-22 stsp (*nentries)++;
5709 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5710 44d03001 2019-05-09 stsp int modified;
5711 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5713 036813ee 2019-05-09 stsp goto done;
5714 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5715 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5717 2f51b5b3 2019-05-09 stsp goto done;
5718 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5719 44d03001 2019-05-09 stsp if (modified) {
5720 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5721 ba580f68 2020-03-22 stsp int nsubentries;
5722 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5723 ba580f68 2020-03-22 stsp &nsubentries, te,
5724 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5725 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5727 44d03001 2019-05-09 stsp goto done;
5728 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5729 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5730 ba580f68 2020-03-22 stsp free(new_id);
5733 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5734 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5735 56e0773d 2019-11-28 stsp free(new_id);
5737 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5739 036813ee 2019-05-09 stsp goto done;
5740 ba580f68 2020-03-22 stsp (*nentries)++;
5744 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5745 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5747 f66c734c 2019-09-22 stsp goto done;
5749 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5750 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5751 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5752 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5753 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5754 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5756 2f51b5b3 2019-05-09 stsp goto done;
5757 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5759 2f51b5b3 2019-05-09 stsp goto done;
5760 ba580f68 2020-03-22 stsp (*nentries)++;
5762 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5763 b416585c 2019-05-13 stsp status_arg);
5765 afa376bf 2019-05-09 stsp goto done;
5767 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5768 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5770 2f51b5b3 2019-05-09 stsp goto done;
5771 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5773 2f51b5b3 2019-05-09 stsp goto done;
5774 ba580f68 2020-03-22 stsp (*nentries)++;
5779 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5780 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5782 d8bacb93 2023-01-10 mark got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5783 2e1fa222 2020-07-23 stsp return err;
5786 2e1fa222 2020-07-23 stsp static const struct got_error *
5787 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5788 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5789 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5790 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5792 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5793 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5794 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5796 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5797 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5798 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5800 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5802 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5803 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5804 437adc9d 2020-12-10 yzhong if (err)
5805 437adc9d 2020-12-10 yzhong goto done;
5808 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5809 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5810 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5811 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5812 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5813 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5814 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5815 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5817 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5818 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5819 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5820 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5821 72fd46fa 2019-09-06 stsp !have_staged_files);
5823 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5824 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5825 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5826 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5827 72fd46fa 2019-09-06 stsp !have_staged_files);
5829 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5831 437adc9d 2020-12-10 yzhong goto done;
5832 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5833 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5834 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5835 3969253a 2020-03-07 stsp if (err) {
5836 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5837 437adc9d 2020-12-10 yzhong goto done;
5839 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5840 3969253a 2020-03-07 stsp if (err) {
5841 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5842 437adc9d 2020-12-10 yzhong goto done;
5845 437adc9d 2020-12-10 yzhong free(relpath);
5846 437adc9d 2020-12-10 yzhong relpath = NULL;
5849 437adc9d 2020-12-10 yzhong free(relpath);
5850 d56d26ce 2019-05-10 stsp return err;
5854 d56d26ce 2019-05-10 stsp static const struct got_error *
5855 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5856 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5857 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5858 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5859 735ef5ac 2019-08-03 stsp int ood_errcode)
5861 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5862 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
5863 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5865 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5866 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5867 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5868 1a36436d 2019-06-10 stsp return NULL;
5870 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5871 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5873 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5875 a44927cc 2022-04-07 stsp goto done;
5876 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5877 9bead371 2019-07-28 stsp if (err) {
5878 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5879 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5880 1a36436d 2019-06-10 stsp goto done;
5881 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5882 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5884 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5885 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5887 a44927cc 2022-04-07 stsp goto done;
5888 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5889 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5890 1a36436d 2019-06-10 stsp goto done;
5891 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5895 a44927cc 2022-04-07 stsp if (commit)
5896 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
5897 1a36436d 2019-06-10 stsp return err;
5900 336075a4 2022-06-25 op static const struct got_error *
5901 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5902 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5903 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5904 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5905 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5906 2a47b1e5 2022-11-01 stsp const char *author, const char *committer, char *diff_path,
5907 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5908 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5909 afa376bf 2019-05-09 stsp struct got_repository *repo)
5911 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5912 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5913 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5914 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5915 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5916 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5917 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5918 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5919 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5920 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5921 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5922 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5923 f8399b8f 2022-07-22 stsp time_t timestamp;
5925 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5927 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5929 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5931 588edf97 2019-05-10 stsp goto done;
5933 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5935 588edf97 2019-05-10 stsp goto done;
5937 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5938 2a47b1e5 2022-11-01 stsp err = commit_msg_cb(commitable_paths, diff_path,
5939 2a47b1e5 2022-11-01 stsp &logmsg, commit_arg);
5944 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5945 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5949 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5950 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5951 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5952 cf066bf8 2019-05-09 stsp char *ondisk_path;
5954 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5955 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5956 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5959 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5960 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5961 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5964 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5965 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5966 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5967 cf066bf8 2019-05-09 stsp goto done;
5969 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5970 2e1fa222 2020-07-23 stsp free(ondisk_path);
5972 cf066bf8 2019-05-09 stsp goto done;
5975 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5976 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5977 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5979 036813ee 2019-05-09 stsp goto done;
5981 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5983 de18fc63 2019-05-09 stsp goto done;
5984 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5985 f259c4c1 2021-09-24 stsp nparents++;
5986 f259c4c1 2021-09-24 stsp if (parent_id2) {
5987 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
5989 f259c4c1 2021-09-24 stsp goto done;
5990 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5991 f259c4c1 2021-09-24 stsp nparents++;
5993 f8399b8f 2022-07-22 stsp timestamp = time(NULL);
5994 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5995 f8399b8f 2022-07-22 stsp nparents, author, timestamp, committer, timestamp, logmsg, repo);
5996 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5997 33ad4cbe 2019-05-12 jcs free(logmsg);
5999 9d40349a 2019-05-09 stsp goto done;
6001 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
6002 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
6003 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
6004 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
6005 09f5bd90 2019-05-09 stsp goto done;
6007 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
6008 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6010 09f5bd90 2019-05-09 stsp goto done;
6011 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6013 ebf99748 2019-05-09 stsp goto done;
6014 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6015 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6016 09f5bd90 2019-05-09 stsp goto done;
6018 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
6019 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
6021 f2c16586 2019-05-09 stsp goto done;
6022 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
6024 f2c16586 2019-05-09 stsp goto done;
6026 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6028 09f5bd90 2019-05-09 stsp goto done;
6030 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
6032 ebf99748 2019-05-09 stsp goto done;
6034 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
6035 588edf97 2019-05-10 stsp if (head_tree)
6036 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
6037 588edf97 2019-05-10 stsp if (head_commit)
6038 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
6039 09f5bd90 2019-05-09 stsp free(head_commit_id2);
6040 2f17228e 2019-05-12 stsp if (head_ref2) {
6041 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
6042 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
6043 2f17228e 2019-05-12 stsp err = unlockerr;
6044 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
6046 39cd0ff6 2019-07-12 stsp return err;
6049 5c1e53bc 2019-07-28 stsp static const struct got_error *
6050 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
6051 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
6053 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
6054 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
6056 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
6057 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
6058 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
6060 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
6061 5c1e53bc 2019-07-28 stsp ct_path++;
6063 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
6064 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
6068 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
6069 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
6071 5c1e53bc 2019-07-28 stsp return NULL;
6074 f0b75401 2019-08-03 stsp static const struct got_error *
6075 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
6077 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
6079 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6080 f0b75401 2019-08-03 stsp *have_staged_files = 1;
6081 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
6084 f0b75401 2019-08-03 stsp return NULL;
6087 5f8a88c6 2019-08-03 stsp static const struct got_error *
6088 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
6089 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
6091 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
6092 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
6094 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6095 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
6097 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6098 5f8a88c6 2019-08-03 stsp if (ie == NULL)
6099 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6100 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6101 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
6102 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
6105 5f8a88c6 2019-08-03 stsp return NULL;
6108 39cd0ff6 2019-07-12 stsp const struct got_error *
6109 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
6110 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
6111 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
6112 2a47b1e5 2022-11-01 stsp int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6113 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
6114 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
6116 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6117 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
6118 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
6119 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6120 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6121 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
6122 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
6123 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6124 2a47b1e5 2022-11-01 stsp char *diff_path = NULL;
6125 f0b75401 2019-08-03 stsp int have_staged_files = 0;
6127 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
6129 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6130 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6132 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
6134 39cd0ff6 2019-07-12 stsp goto done;
6136 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6138 39cd0ff6 2019-07-12 stsp goto done;
6140 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6142 39cd0ff6 2019-07-12 stsp goto done;
6144 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6146 39cd0ff6 2019-07-12 stsp goto done;
6148 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6149 5f8a88c6 2019-08-03 stsp &have_staged_files);
6150 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
6151 5f8a88c6 2019-08-03 stsp goto done;
6152 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
6153 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
6155 5f8a88c6 2019-08-03 stsp goto done;
6158 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6159 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
6160 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
6161 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
6162 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
6163 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6164 2a47b1e5 2022-11-01 stsp cc_arg.diff_header_shown = 0;
6165 2a47b1e5 2022-11-01 stsp if (show_diff) {
6166 2a47b1e5 2022-11-01 stsp err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6167 b90054ed 2022-11-01 stsp GOT_TMPDIR_STR "/got", ".diff");
6169 2a47b1e5 2022-11-01 stsp goto done;
6170 2a47b1e5 2022-11-01 stsp cc_arg.f1 = got_opentemp();
6171 2a47b1e5 2022-11-01 stsp if (cc_arg.f1 == NULL) {
6172 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6173 2a47b1e5 2022-11-01 stsp goto done;
6175 2a47b1e5 2022-11-01 stsp cc_arg.f2 = got_opentemp();
6176 2a47b1e5 2022-11-01 stsp if (cc_arg.f2 == NULL) {
6177 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6178 2a47b1e5 2022-11-01 stsp goto done;
6182 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6183 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6184 4ba2e955 2022-09-02 sh+got collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6186 5c1e53bc 2019-07-28 stsp goto done;
6189 2a47b1e5 2022-11-01 stsp if (show_diff) {
6190 2a47b1e5 2022-11-01 stsp if (fflush(cc_arg.diff_outfile) == EOF) {
6191 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fflush");
6192 2a47b1e5 2022-11-01 stsp goto done;
6196 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6197 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6198 39cd0ff6 2019-07-12 stsp goto done;
6201 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6202 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
6204 5c1e53bc 2019-07-28 stsp goto done;
6207 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6208 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
6209 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
6211 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
6212 f0b75401 2019-08-03 stsp ct_path++;
6213 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
6214 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6215 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6217 b50cabdf 2019-07-12 stsp goto done;
6221 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
6222 210c2321 2022-11-01 stsp head_commit_id, NULL, worktree, author, committer,
6223 210c2321 2022-11-01 stsp (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6224 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6226 39cd0ff6 2019-07-12 stsp goto done;
6228 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6229 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
6230 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6231 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
6232 39cd0ff6 2019-07-12 stsp err = sync_err;
6234 39cd0ff6 2019-07-12 stsp if (fileindex)
6235 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
6236 39cd0ff6 2019-07-12 stsp free(fileindex_path);
6237 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6238 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
6239 39cd0ff6 2019-07-12 stsp err = unlockerr;
6240 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6241 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
6243 39cd0ff6 2019-07-12 stsp free_commitable(ct);
6245 d8bacb93 2023-01-10 mark got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6246 2a47b1e5 2022-11-01 stsp if (diff_path && unlink(diff_path) == -1 && err == NULL)
6247 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("unlink", diff_path);
6248 2a47b1e5 2022-11-01 stsp free(diff_path);
6249 2a47b1e5 2022-11-01 stsp if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6250 2a47b1e5 2022-11-01 stsp err == NULL)
6251 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
6252 c4296144 2019-05-09 stsp return err;
6255 8656d6c4 2019-05-20 stsp const char *
6256 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
6258 8656d6c4 2019-05-20 stsp return ct->path;
6261 8656d6c4 2019-05-20 stsp unsigned int
6262 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
6264 8656d6c4 2019-05-20 stsp return ct->status;
6267 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
6268 818c7501 2019-07-11 stsp struct got_worktree *worktree;
6269 818c7501 2019-07-11 stsp struct got_repository *repo;
6272 818c7501 2019-07-11 stsp static const struct got_error *
6273 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6275 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6276 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
6277 818c7501 2019-07-11 stsp unsigned char status;
6278 818c7501 2019-07-11 stsp struct stat sb;
6279 818c7501 2019-07-11 stsp char *ondisk_path;
6281 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
6282 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6283 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
6284 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
6286 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6288 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
6290 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
6291 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6292 818c7501 2019-07-11 stsp free(ondisk_path);
6294 818c7501 2019-07-11 stsp return err;
6296 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
6297 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
6298 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6299 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6301 818c7501 2019-07-11 stsp return NULL;
6304 818c7501 2019-07-11 stsp const struct got_error *
6305 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6306 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6307 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
6308 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6310 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6311 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6312 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6313 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6314 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6315 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6316 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6318 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6319 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6320 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6322 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6324 818c7501 2019-07-11 stsp return err;
6326 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6328 818c7501 2019-07-11 stsp goto done;
6330 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6331 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6332 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6335 818c7501 2019-07-11 stsp goto done;
6337 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6339 818c7501 2019-07-11 stsp goto done;
6341 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6343 818c7501 2019-07-11 stsp goto done;
6345 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6347 818c7501 2019-07-11 stsp goto done;
6349 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6352 e51d7b55 2020-01-04 stsp goto done;
6354 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6356 818c7501 2019-07-11 stsp goto done;
6357 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6358 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6359 e51d7b55 2020-01-04 stsp goto done;
6362 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6363 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6365 818c7501 2019-07-11 stsp goto done;
6366 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6368 818c7501 2019-07-11 stsp goto done;
6370 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6372 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6374 818c7501 2019-07-11 stsp goto done;
6376 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6378 818c7501 2019-07-11 stsp goto done;
6380 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6381 818c7501 2019-07-11 stsp worktree->base_commit_id);
6383 818c7501 2019-07-11 stsp goto done;
6384 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6386 818c7501 2019-07-11 stsp goto done;
6388 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6390 818c7501 2019-07-11 stsp goto done;
6392 818c7501 2019-07-11 stsp free(fileindex_path);
6393 818c7501 2019-07-11 stsp free(tmp_branch_name);
6394 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6395 818c7501 2019-07-11 stsp free(branch_ref_name);
6396 818c7501 2019-07-11 stsp if (branch_ref)
6397 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6398 818c7501 2019-07-11 stsp if (wt_branch)
6399 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6400 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6401 818c7501 2019-07-11 stsp if (err) {
6402 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6403 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6404 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6406 818c7501 2019-07-11 stsp if (*tmp_branch) {
6407 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6408 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6410 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6411 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6412 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6414 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6416 818c7501 2019-07-11 stsp return err;
6419 818c7501 2019-07-11 stsp const struct got_error *
6420 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6421 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6422 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6423 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6425 818c7501 2019-07-11 stsp const struct got_error *err;
6426 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6427 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6428 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6429 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6430 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6432 818c7501 2019-07-11 stsp *commit_id = NULL;
6433 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6434 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6435 3e3a69f1 2019-07-25 stsp *branch = NULL;
6436 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6438 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6440 3e3a69f1 2019-07-25 stsp return err;
6442 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6444 f032f1f7 2019-08-04 stsp goto done;
6446 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6447 f032f1f7 2019-08-04 stsp &have_staged_files);
6448 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6449 f032f1f7 2019-08-04 stsp goto done;
6450 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6451 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6452 3e3a69f1 2019-07-25 stsp goto done;
6455 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6457 f032f1f7 2019-08-04 stsp goto done;
6459 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6461 818c7501 2019-07-11 stsp goto done;
6463 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6465 818c7501 2019-07-11 stsp goto done;
6467 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6469 818c7501 2019-07-11 stsp goto done;
6471 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6473 818c7501 2019-07-11 stsp goto done;
6475 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6476 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6478 818c7501 2019-07-11 stsp goto done;
6480 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6482 818c7501 2019-07-11 stsp goto done;
6484 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6486 818c7501 2019-07-11 stsp goto done;
6488 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6489 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6491 818c7501 2019-07-11 stsp goto done;
6493 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6495 818c7501 2019-07-11 stsp goto done;
6497 818c7501 2019-07-11 stsp free(commit_ref_name);
6498 818c7501 2019-07-11 stsp free(branch_ref_name);
6499 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6500 818c7501 2019-07-11 stsp if (commit_ref)
6501 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6502 818c7501 2019-07-11 stsp if (branch_ref)
6503 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6504 818c7501 2019-07-11 stsp if (err) {
6505 818c7501 2019-07-11 stsp free(*commit_id);
6506 818c7501 2019-07-11 stsp *commit_id = NULL;
6507 818c7501 2019-07-11 stsp if (*tmp_branch) {
6508 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6509 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6511 818c7501 2019-07-11 stsp if (*new_base_branch) {
6512 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6513 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6515 818c7501 2019-07-11 stsp if (*branch) {
6516 818c7501 2019-07-11 stsp got_ref_close(*branch);
6517 818c7501 2019-07-11 stsp *branch = NULL;
6519 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6520 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6521 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6523 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6525 818c7501 2019-07-11 stsp return err;
6528 818c7501 2019-07-11 stsp const struct got_error *
6529 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6531 818c7501 2019-07-11 stsp const struct got_error *err;
6532 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6534 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6536 818c7501 2019-07-11 stsp return err;
6538 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6539 818c7501 2019-07-11 stsp free(tmp_branch_name);
6540 818c7501 2019-07-11 stsp return NULL;
6543 818c7501 2019-07-11 stsp static const struct got_error *
6544 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6545 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
6547 0ebf8283 2019-07-24 stsp *logmsg = arg;
6548 818c7501 2019-07-11 stsp return NULL;
6551 818c7501 2019-07-11 stsp static const struct got_error *
6552 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6553 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6554 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6555 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6557 818c7501 2019-07-11 stsp return NULL;
6560 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6561 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6562 01757395 2019-07-12 stsp void *progress_arg;
6563 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6566 01757395 2019-07-12 stsp static const struct got_error *
6567 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6569 01757395 2019-07-12 stsp const struct got_error *err;
6570 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6572 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6574 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6576 01757395 2019-07-12 stsp return err;
6578 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6579 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6580 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6581 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6582 01757395 2019-07-12 stsp return NULL;
6584 01757395 2019-07-12 stsp p = strdup(path);
6585 01757395 2019-07-12 stsp if (p == NULL)
6586 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6588 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6589 01757395 2019-07-12 stsp if (err || new == NULL)
6591 01757395 2019-07-12 stsp return err;
6594 0ebf8283 2019-07-24 stsp static const struct got_error *
6595 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6596 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6598 818c7501 2019-07-11 stsp const struct got_error *err;
6599 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6601 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6602 818c7501 2019-07-11 stsp if (err) {
6603 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6604 818c7501 2019-07-11 stsp goto done;
6605 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6607 818c7501 2019-07-11 stsp goto done;
6608 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6610 818c7501 2019-07-11 stsp goto done;
6611 de05890f 2020-03-05 stsp } else if (is_rebase) {
6612 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6615 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6617 818c7501 2019-07-11 stsp goto done;
6618 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6619 818c7501 2019-07-11 stsp free(stored_id);
6620 818c7501 2019-07-11 stsp if (cmp != 0) {
6621 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6622 818c7501 2019-07-11 stsp goto done;
6626 0ebf8283 2019-07-24 stsp if (commit_ref)
6627 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6628 0ebf8283 2019-07-24 stsp return err;
6631 0ebf8283 2019-07-24 stsp static const struct got_error *
6632 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6633 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6634 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6635 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6636 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6637 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6639 0ebf8283 2019-07-24 stsp const struct got_error *err;
6640 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6641 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6642 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6644 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6646 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6648 0ebf8283 2019-07-24 stsp return err;
6650 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6651 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6652 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6653 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6654 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6655 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6656 818c7501 2019-07-11 stsp if (commit_ref)
6657 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6658 818c7501 2019-07-11 stsp return err;
6661 818c7501 2019-07-11 stsp const struct got_error *
6662 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6663 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6664 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6665 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6666 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6667 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6669 0ebf8283 2019-07-24 stsp const struct got_error *err;
6670 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6672 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6674 0ebf8283 2019-07-24 stsp return err;
6676 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6678 0ebf8283 2019-07-24 stsp goto done;
6680 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6681 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6682 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6684 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6685 0ebf8283 2019-07-24 stsp return err;
6688 0ebf8283 2019-07-24 stsp const struct got_error *
6689 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6690 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6691 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6692 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6693 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6694 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6696 0ebf8283 2019-07-24 stsp const struct got_error *err;
6697 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6699 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6701 0ebf8283 2019-07-24 stsp return err;
6703 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6705 0ebf8283 2019-07-24 stsp goto done;
6707 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6708 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6709 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6711 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6712 0ebf8283 2019-07-24 stsp return err;
6715 0ebf8283 2019-07-24 stsp static const struct got_error *
6716 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6717 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6718 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6719 598eac43 2022-07-22 stsp struct got_reference *tmp_branch, const char *committer,
6720 598eac43 2022-07-22 stsp struct got_commit_object *orig_commit, const char *new_logmsg,
6721 598eac43 2022-07-22 stsp struct got_repository *repo)
6723 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6724 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6725 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6726 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6727 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6728 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6729 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6731 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6732 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6733 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6735 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6737 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6739 3e3a69f1 2019-07-25 stsp return err;
6741 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6742 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6743 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6744 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6746 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6747 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6749 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6750 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6751 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6752 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6753 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6754 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6756 01757395 2019-07-12 stsp if (merged_paths) {
6757 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6758 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6759 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6760 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6763 01757395 2019-07-12 stsp goto done;
6766 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6767 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6769 01757395 2019-07-12 stsp goto done;
6772 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6773 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6774 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6776 a0e95631 2019-07-12 stsp goto done;
6777 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6778 a0e95631 2019-07-12 stsp goto done;
6781 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6783 edd02c5e 2019-07-11 stsp goto done;
6785 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6787 818c7501 2019-07-11 stsp goto done;
6789 5943eee2 2019-08-13 stsp if (new_logmsg) {
6790 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6791 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6792 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6793 5943eee2 2019-08-13 stsp goto done;
6796 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6798 5943eee2 2019-08-13 stsp goto done;
6801 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6802 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6803 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6804 50e7a649 2022-07-22 stsp committer ? committer :
6805 2a47b1e5 2022-11-01 stsp got_object_commit_get_committer(orig_commit), NULL,
6806 50e7a649 2022-07-22 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6808 a0e95631 2019-07-12 stsp goto done;
6810 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6812 a0e95631 2019-07-12 stsp goto done;
6814 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6816 a0e95631 2019-07-12 stsp goto done;
6818 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6819 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6820 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6821 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6822 a0e95631 2019-07-12 stsp err = sync_err;
6824 a0e95631 2019-07-12 stsp free(fileindex_path);
6825 a0e95631 2019-07-12 stsp free(head_commit_id);
6826 a0e95631 2019-07-12 stsp if (head_ref)
6827 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6828 818c7501 2019-07-11 stsp if (err) {
6829 818c7501 2019-07-11 stsp free(*new_commit_id);
6830 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6832 818c7501 2019-07-11 stsp return err;
6835 818c7501 2019-07-11 stsp const struct got_error *
6836 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6837 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6838 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6839 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6840 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6842 0ebf8283 2019-07-24 stsp const struct got_error *err;
6843 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6844 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6845 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6847 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6849 0ebf8283 2019-07-24 stsp return err;
6851 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6853 0ebf8283 2019-07-24 stsp goto done;
6854 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6856 0ebf8283 2019-07-24 stsp goto done;
6857 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6858 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6859 0ebf8283 2019-07-24 stsp goto done;
6862 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6863 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6864 598eac43 2022-07-22 stsp NULL, repo);
6866 0ebf8283 2019-07-24 stsp if (commit_ref)
6867 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6868 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6869 0ebf8283 2019-07-24 stsp free(commit_id);
6870 0ebf8283 2019-07-24 stsp return err;
6873 0ebf8283 2019-07-24 stsp const struct got_error *
6874 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6875 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6876 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6877 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6878 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6879 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6881 0ebf8283 2019-07-24 stsp const struct got_error *err;
6882 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6883 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6885 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6887 0ebf8283 2019-07-24 stsp return err;
6889 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6891 0ebf8283 2019-07-24 stsp goto done;
6893 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6894 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6895 598eac43 2022-07-22 stsp new_logmsg, repo);
6897 0ebf8283 2019-07-24 stsp if (commit_ref)
6898 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6899 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6900 0ebf8283 2019-07-24 stsp return err;
6903 0ebf8283 2019-07-24 stsp const struct got_error *
6904 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6905 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6907 3e3a69f1 2019-07-25 stsp if (fileindex)
6908 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6909 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6912 69844fba 2019-07-11 stsp static const struct got_error *
6913 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6915 69844fba 2019-07-11 stsp const struct got_error *err;
6916 69844fba 2019-07-11 stsp struct got_reference *ref;
6918 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6919 69844fba 2019-07-11 stsp if (err) {
6920 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6921 69844fba 2019-07-11 stsp return NULL;
6922 69844fba 2019-07-11 stsp return err;
6925 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6926 69844fba 2019-07-11 stsp got_ref_close(ref);
6927 69844fba 2019-07-11 stsp return err;
6930 69844fba 2019-07-11 stsp static const struct got_error *
6931 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6933 69844fba 2019-07-11 stsp const struct got_error *err;
6934 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6935 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6937 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6939 69844fba 2019-07-11 stsp goto done;
6940 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6942 69844fba 2019-07-11 stsp goto done;
6944 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6946 69844fba 2019-07-11 stsp goto done;
6947 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6949 69844fba 2019-07-11 stsp goto done;
6951 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6953 69844fba 2019-07-11 stsp goto done;
6954 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6956 69844fba 2019-07-11 stsp goto done;
6958 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6960 69844fba 2019-07-11 stsp goto done;
6961 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6963 69844fba 2019-07-11 stsp goto done;
6966 69844fba 2019-07-11 stsp free(tmp_branch_name);
6967 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6968 69844fba 2019-07-11 stsp free(branch_ref_name);
6969 69844fba 2019-07-11 stsp free(commit_ref_name);
6970 e600f124 2021-03-21 stsp return err;
6973 336075a4 2022-06-25 op static const struct got_error *
6974 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6975 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6977 e600f124 2021-03-21 stsp const struct got_error *err;
6978 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6979 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6980 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6981 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6982 e600f124 2021-03-21 stsp char *refname = NULL;
6984 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6985 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6986 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6987 e600f124 2021-03-21 stsp branch_name += 11;
6989 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6991 e600f124 2021-03-21 stsp return err;
6993 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6994 e600f124 2021-03-21 stsp new_id_str) == -1) {
6995 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6996 e600f124 2021-03-21 stsp goto done;
6999 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
7001 e600f124 2021-03-21 stsp goto done;
7003 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
7005 e600f124 2021-03-21 stsp goto done;
7007 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
7009 e600f124 2021-03-21 stsp free(new_id_str);
7010 e600f124 2021-03-21 stsp free(refname);
7011 e600f124 2021-03-21 stsp free(old_commit_id);
7013 e600f124 2021-03-21 stsp got_ref_close(ref);
7014 69844fba 2019-07-11 stsp return err;
7017 818c7501 2019-07-11 stsp const struct got_error *
7018 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
7019 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
7020 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
7021 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
7023 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7024 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
7025 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7027 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7029 818c7501 2019-07-11 stsp return err;
7031 e600f124 2021-03-21 stsp if (create_backup) {
7032 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7033 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
7035 e600f124 2021-03-21 stsp goto done;
7038 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7040 818c7501 2019-07-11 stsp goto done;
7042 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
7044 818c7501 2019-07-11 stsp goto done;
7046 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
7048 818c7501 2019-07-11 stsp goto done;
7050 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
7052 a615e0e7 2020-12-16 stsp goto done;
7054 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7056 a615e0e7 2020-12-16 stsp goto done;
7057 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7058 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7059 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7060 a615e0e7 2020-12-16 stsp err = sync_err;
7062 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7063 a615e0e7 2020-12-16 stsp free(fileindex_path);
7064 818c7501 2019-07-11 stsp free(new_head_commit_id);
7065 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7066 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7067 818c7501 2019-07-11 stsp err = unlockerr;
7068 818c7501 2019-07-11 stsp return err;
7071 818c7501 2019-07-11 stsp const struct got_error *
7072 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
7073 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7074 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
7075 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
7077 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
7078 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
7079 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
7080 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7081 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
7082 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7083 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
7085 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
7087 818c7501 2019-07-11 stsp return err;
7089 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7090 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7092 a44927cc 2022-04-07 stsp goto done;
7094 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
7095 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
7097 818c7501 2019-07-11 stsp goto done;
7099 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
7101 818c7501 2019-07-11 stsp goto done;
7104 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
7105 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
7106 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
7108 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
7110 818c7501 2019-07-11 stsp goto done;
7112 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7114 818c7501 2019-07-11 stsp goto done;
7116 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7117 a44927cc 2022-04-07 stsp worktree->path_prefix);
7119 ca355955 2019-07-12 stsp goto done;
7121 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
7123 ca355955 2019-07-12 stsp goto done;
7125 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7127 818c7501 2019-07-11 stsp goto done;
7129 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7130 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7131 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7132 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7133 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7134 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7135 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7136 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7137 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
7138 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7140 1f1abb7e 2019-08-08 stsp goto sync;
7142 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7143 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
7145 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7146 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
7147 ca355955 2019-07-12 stsp err = sync_err;
7149 818c7501 2019-07-11 stsp got_ref_close(resolved);
7150 a3a2faf2 2019-07-12 stsp free(tree_id);
7151 818c7501 2019-07-11 stsp free(commit_id);
7152 a44927cc 2022-04-07 stsp if (commit)
7153 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7154 0ebf8283 2019-07-24 stsp if (fileindex)
7155 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
7156 0ebf8283 2019-07-24 stsp free(fileindex_path);
7158 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7159 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7160 0ebf8283 2019-07-24 stsp err = unlockerr;
7161 0ebf8283 2019-07-24 stsp return err;
7164 0ebf8283 2019-07-24 stsp const struct got_error *
7165 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7166 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7167 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7168 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7170 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7171 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7172 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
7173 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
7174 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7175 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
7176 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
7177 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7179 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7180 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7181 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7182 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7184 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7186 0ebf8283 2019-07-24 stsp return err;
7188 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7190 0ebf8283 2019-07-24 stsp goto done;
7192 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
7193 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
7194 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7197 0ebf8283 2019-07-24 stsp goto done;
7199 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7201 0ebf8283 2019-07-24 stsp goto done;
7203 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7205 0ebf8283 2019-07-24 stsp goto done;
7207 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7208 0ebf8283 2019-07-24 stsp worktree);
7210 0ebf8283 2019-07-24 stsp goto done;
7212 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7215 0ebf8283 2019-07-24 stsp goto done;
7217 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7219 0ebf8283 2019-07-24 stsp goto done;
7221 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
7223 0ebf8283 2019-07-24 stsp goto done;
7225 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7226 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7228 0ebf8283 2019-07-24 stsp goto done;
7229 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
7231 0ebf8283 2019-07-24 stsp goto done;
7232 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7233 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
7234 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
7235 0ebf8283 2019-07-24 stsp goto done;
7238 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
7239 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7241 0ebf8283 2019-07-24 stsp goto done;
7242 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
7244 0ebf8283 2019-07-24 stsp goto done;
7246 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
7248 0ebf8283 2019-07-24 stsp goto done;
7250 0ebf8283 2019-07-24 stsp free(fileindex_path);
7251 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7252 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7253 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7254 0ebf8283 2019-07-24 stsp if (wt_branch)
7255 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
7256 0ebf8283 2019-07-24 stsp if (err) {
7257 0ebf8283 2019-07-24 stsp if (*branch_ref) {
7258 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
7259 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7261 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7262 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7263 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7265 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7266 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7267 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7268 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7270 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
7272 0ebf8283 2019-07-24 stsp return err;
7275 0ebf8283 2019-07-24 stsp const struct got_error *
7276 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
7277 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
7279 3e3a69f1 2019-07-25 stsp if (fileindex)
7280 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
7281 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
7284 0ebf8283 2019-07-24 stsp const struct got_error *
7285 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
7286 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
7288 0ebf8283 2019-07-24 stsp const struct got_error *err;
7289 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7291 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7293 0ebf8283 2019-07-24 stsp return err;
7295 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7296 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7297 0ebf8283 2019-07-24 stsp return NULL;
7300 0ebf8283 2019-07-24 stsp const struct got_error *
7301 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
7302 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
7303 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7304 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7306 0ebf8283 2019-07-24 stsp const struct got_error *err;
7307 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7308 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7309 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
7310 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7311 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
7312 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
7314 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7315 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7316 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7317 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7319 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7321 3e3a69f1 2019-07-25 stsp return err;
7323 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7325 f032f1f7 2019-08-04 stsp goto done;
7327 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7328 f032f1f7 2019-08-04 stsp &have_staged_files);
7329 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7330 f032f1f7 2019-08-04 stsp goto done;
7331 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7332 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7333 3e3a69f1 2019-07-25 stsp goto done;
7336 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7338 f032f1f7 2019-08-04 stsp goto done;
7340 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7342 0ebf8283 2019-07-24 stsp goto done;
7344 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7346 0ebf8283 2019-07-24 stsp goto done;
7348 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7349 0ebf8283 2019-07-24 stsp worktree);
7351 0ebf8283 2019-07-24 stsp goto done;
7353 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7355 0ebf8283 2019-07-24 stsp goto done;
7357 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7359 0ebf8283 2019-07-24 stsp goto done;
7360 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7362 0ebf8283 2019-07-24 stsp goto done;
7364 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7366 0ebf8283 2019-07-24 stsp goto done;
7367 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7369 0ebf8283 2019-07-24 stsp goto done;
7371 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7373 0ebf8283 2019-07-24 stsp goto done;
7375 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7376 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7377 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7378 0ebf8283 2019-07-24 stsp if (commit_ref)
7379 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7380 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7381 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7382 0ebf8283 2019-07-24 stsp if (err) {
7383 0ebf8283 2019-07-24 stsp free(*commit_id);
7384 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7385 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7386 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7387 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7388 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7389 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7391 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7392 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7393 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7395 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7397 0ebf8283 2019-07-24 stsp return err;
7400 0ebf8283 2019-07-24 stsp static const struct got_error *
7401 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7403 0ebf8283 2019-07-24 stsp const struct got_error *err;
7404 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7405 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7407 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7409 0ebf8283 2019-07-24 stsp goto done;
7410 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7412 0ebf8283 2019-07-24 stsp goto done;
7414 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7415 0ebf8283 2019-07-24 stsp worktree);
7417 0ebf8283 2019-07-24 stsp goto done;
7418 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7420 0ebf8283 2019-07-24 stsp goto done;
7422 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7424 0ebf8283 2019-07-24 stsp goto done;
7425 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7427 0ebf8283 2019-07-24 stsp goto done;
7429 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7431 0ebf8283 2019-07-24 stsp goto done;
7432 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7434 0ebf8283 2019-07-24 stsp goto done;
7436 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7437 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7438 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7439 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7440 0ebf8283 2019-07-24 stsp return err;
7443 0ebf8283 2019-07-24 stsp const struct got_error *
7444 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7445 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7446 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7447 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7449 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7450 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7451 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7452 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7453 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7454 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7456 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7458 0ebf8283 2019-07-24 stsp return err;
7460 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7461 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7463 a44927cc 2022-04-07 stsp goto done;
7465 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7466 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7468 0ebf8283 2019-07-24 stsp goto done;
7470 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7472 0ebf8283 2019-07-24 stsp goto done;
7474 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7476 0ebf8283 2019-07-24 stsp goto done;
7478 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7479 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7481 0ebf8283 2019-07-24 stsp goto done;
7483 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7485 0ebf8283 2019-07-24 stsp goto done;
7487 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7489 0ebf8283 2019-07-24 stsp goto done;
7491 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7492 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7493 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7494 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7495 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7496 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7497 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7498 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7499 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7500 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7502 1f1abb7e 2019-08-08 stsp goto sync;
7504 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7505 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7507 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7508 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7509 0ebf8283 2019-07-24 stsp err = sync_err;
7511 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7512 0ebf8283 2019-07-24 stsp free(tree_id);
7513 818c7501 2019-07-11 stsp free(fileindex_path);
7515 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7516 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7517 818c7501 2019-07-11 stsp err = unlockerr;
7518 818c7501 2019-07-11 stsp return err;
7521 0ebf8283 2019-07-24 stsp const struct got_error *
7522 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7523 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7524 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7526 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7527 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7528 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7529 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7531 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7533 0ebf8283 2019-07-24 stsp return err;
7535 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7536 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7538 e600f124 2021-03-21 stsp goto done;
7540 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7541 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7543 0ebf8283 2019-07-24 stsp goto done;
7545 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7547 0ebf8283 2019-07-24 stsp goto done;
7549 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7551 0ebf8283 2019-07-24 stsp goto done;
7553 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7555 0ebf8283 2019-07-24 stsp goto done;
7557 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7559 a615e0e7 2020-12-16 stsp goto done;
7561 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7563 a615e0e7 2020-12-16 stsp goto done;
7564 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7565 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7566 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7567 a615e0e7 2020-12-16 stsp err = sync_err;
7569 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7570 a615e0e7 2020-12-16 stsp free(fileindex_path);
7571 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7572 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7573 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7574 0ebf8283 2019-07-24 stsp err = unlockerr;
7575 0ebf8283 2019-07-24 stsp return err;
7578 0ebf8283 2019-07-24 stsp const struct got_error *
7579 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7580 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7582 0ebf8283 2019-07-24 stsp const struct got_error *err;
7583 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7585 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7587 0ebf8283 2019-07-24 stsp return err;
7589 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7591 0ebf8283 2019-07-24 stsp goto done;
7593 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7595 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7596 2822a352 2019-10-15 stsp return err;
7599 2822a352 2019-10-15 stsp const struct got_error *
7600 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7601 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7602 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7603 2822a352 2019-10-15 stsp struct got_repository *repo)
7605 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7606 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7607 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7609 2822a352 2019-10-15 stsp *fileindex = NULL;
7610 2822a352 2019-10-15 stsp *branch_ref = NULL;
7611 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7613 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7615 2822a352 2019-10-15 stsp return err;
7617 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7618 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7619 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7620 2822a352 2019-10-15 stsp "update -b or different branch name required");
7621 2822a352 2019-10-15 stsp goto done;
7624 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7626 2822a352 2019-10-15 stsp goto done;
7628 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7629 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7630 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7631 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7634 2822a352 2019-10-15 stsp goto done;
7636 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7638 2822a352 2019-10-15 stsp goto done;
7640 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7641 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7643 2822a352 2019-10-15 stsp if (err) {
7644 2822a352 2019-10-15 stsp if (*branch_ref) {
7645 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7646 2822a352 2019-10-15 stsp *branch_ref = NULL;
7648 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7649 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7650 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7652 2822a352 2019-10-15 stsp if (*fileindex) {
7653 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7654 2822a352 2019-10-15 stsp *fileindex = NULL;
7656 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7658 0cb83759 2019-08-03 stsp return err;
7661 2822a352 2019-10-15 stsp const struct got_error *
7662 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7663 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7664 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7665 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7666 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7668 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7669 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7670 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7671 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7673 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7675 2822a352 2019-10-15 stsp goto done;
7677 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7679 2822a352 2019-10-15 stsp goto done;
7681 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7683 a44927cc 2022-04-07 stsp goto done;
7685 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7686 2822a352 2019-10-15 stsp worktree->path_prefix);
7688 2822a352 2019-10-15 stsp goto done;
7690 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7692 2822a352 2019-10-15 stsp goto done;
7694 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7695 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7697 2822a352 2019-10-15 stsp goto sync;
7699 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7701 2822a352 2019-10-15 stsp goto sync;
7703 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7705 6e210706 2021-01-22 stsp goto sync;
7707 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7709 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7710 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7711 2822a352 2019-10-15 stsp err = sync_err;
7714 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7715 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7716 2822a352 2019-10-15 stsp err = unlockerr;
7717 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7719 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7720 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7721 2822a352 2019-10-15 stsp err = unlockerr;
7722 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7724 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7725 2822a352 2019-10-15 stsp free(fileindex_path);
7726 2822a352 2019-10-15 stsp free(tree_id);
7727 a44927cc 2022-04-07 stsp if (commit)
7728 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7730 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7731 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7732 2822a352 2019-10-15 stsp err = unlockerr;
7733 2822a352 2019-10-15 stsp return err;
7736 2822a352 2019-10-15 stsp const struct got_error *
7737 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7738 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7739 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7741 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7743 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7745 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7747 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7748 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7749 8b692cd0 2019-10-21 stsp err = unlockerr;
7750 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7752 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7753 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7754 8b692cd0 2019-10-21 stsp err = unlockerr;
7755 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7757 f259c4c1 2021-09-24 stsp return err;
7760 f259c4c1 2021-09-24 stsp const struct got_error *
7761 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7762 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7764 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7765 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7767 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7769 f259c4c1 2021-09-24 stsp goto done;
7771 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7773 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7774 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7775 f259c4c1 2021-09-24 stsp err = sync_err;
7777 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7778 f259c4c1 2021-09-24 stsp free(fileindex_path);
7779 8b692cd0 2019-10-21 stsp return err;
7782 f259c4c1 2021-09-24 stsp static const struct got_error *
7783 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7785 f259c4c1 2021-09-24 stsp const struct got_error *err;
7786 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7788 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7790 f259c4c1 2021-09-24 stsp goto done;
7791 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7793 f259c4c1 2021-09-24 stsp goto done;
7795 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7797 f259c4c1 2021-09-24 stsp goto done;
7798 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7800 f259c4c1 2021-09-24 stsp goto done;
7803 f259c4c1 2021-09-24 stsp free(branch_refname);
7804 f259c4c1 2021-09-24 stsp free(commit_refname);
7805 f259c4c1 2021-09-24 stsp return err;
7808 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7809 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7810 f259c4c1 2021-09-24 stsp const char *branch_name;
7813 f259c4c1 2021-09-24 stsp static const struct got_error *
7814 2a47b1e5 2022-11-01 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7815 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
7817 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7819 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7820 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7821 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7823 f259c4c1 2021-09-24 stsp return NULL;
7827 f259c4c1 2021-09-24 stsp const struct got_error *
7828 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7829 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7830 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7831 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7832 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7833 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7835 f259c4c1 2021-09-24 stsp const struct got_error *err;
7836 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7838 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7840 f259c4c1 2021-09-24 stsp goto done;
7842 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7843 f259c4c1 2021-09-24 stsp worktree);
7845 f259c4c1 2021-09-24 stsp goto done;
7847 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7848 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7849 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7851 f259c4c1 2021-09-24 stsp free(fileindex_path);
7852 f259c4c1 2021-09-24 stsp return err;
7855 f259c4c1 2021-09-24 stsp const struct got_error *
7856 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7857 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7858 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7859 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7860 0ff8d236 2021-09-28 stsp struct got_repository *repo,
7861 0ff8d236 2021-09-28 stsp got_worktree_status_cb status_cb, void *status_arg)
7864 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7865 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7866 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7867 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7868 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7869 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7870 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7871 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7872 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7874 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
7875 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7877 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7879 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7881 f259c4c1 2021-09-24 stsp goto done;
7883 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7885 f259c4c1 2021-09-24 stsp goto done;
7887 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7889 f259c4c1 2021-09-24 stsp goto done;
7891 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7892 f259c4c1 2021-09-24 stsp &have_staged_files);
7893 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7894 f259c4c1 2021-09-24 stsp goto done;
7895 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7896 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7897 f259c4c1 2021-09-24 stsp goto done;
7900 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7901 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7902 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7903 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7904 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7905 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7906 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7907 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7909 f259c4c1 2021-09-24 stsp goto done;
7911 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7912 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7913 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7914 f259c4c1 2021-09-24 stsp goto done;
7917 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7918 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7919 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
7921 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
7922 f259c4c1 2021-09-24 stsp ct_path++;
7923 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
7924 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7925 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7927 f259c4c1 2021-09-24 stsp goto done;
7931 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
7932 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
7933 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
7934 2a47b1e5 2022-11-01 stsp head_commit_id, branch_tip, worktree, author, committer, NULL,
7935 0ff8d236 2021-09-28 stsp merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7937 f259c4c1 2021-09-24 stsp goto done;
7939 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
7940 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
7941 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7942 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7943 f259c4c1 2021-09-24 stsp err = sync_err;
7945 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7946 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7948 f259c4c1 2021-09-24 stsp free_commitable(ct);
7950 d8bacb93 2023-01-10 mark got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
7951 f259c4c1 2021-09-24 stsp free(fileindex_path);
7952 f259c4c1 2021-09-24 stsp return err;
7955 f259c4c1 2021-09-24 stsp const struct got_error *
7956 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
7957 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
7959 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7960 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7962 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7964 f259c4c1 2021-09-24 stsp goto done;
7966 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7968 f259c4c1 2021-09-24 stsp goto done;
7969 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7970 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7971 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7972 f259c4c1 2021-09-24 stsp err = sync_err;
7974 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7975 f259c4c1 2021-09-24 stsp free(fileindex_path);
7976 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7977 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7978 f259c4c1 2021-09-24 stsp err = unlockerr;
7979 f259c4c1 2021-09-24 stsp return err;
7982 f259c4c1 2021-09-24 stsp const struct got_error *
7983 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7984 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7986 f259c4c1 2021-09-24 stsp const struct got_error *err;
7987 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
7988 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
7990 f259c4c1 2021-09-24 stsp *in_progress = 0;
7992 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7994 f259c4c1 2021-09-24 stsp return err;
7995 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7996 793fcac3 2021-09-24 stsp free(branch_refname);
7997 f259c4c1 2021-09-24 stsp if (err) {
7998 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
7999 f259c4c1 2021-09-24 stsp return err;
8001 f259c4c1 2021-09-24 stsp *in_progress = 1;
8003 f259c4c1 2021-09-24 stsp return NULL;
8006 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
8007 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
8008 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
8010 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
8011 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8012 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
8013 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8014 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
8015 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8016 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
8018 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8020 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8022 f259c4c1 2021-09-24 stsp return err;
8024 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8026 f259c4c1 2021-09-24 stsp goto done;
8028 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
8029 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
8030 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
8031 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8034 f259c4c1 2021-09-24 stsp goto done;
8036 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8038 f259c4c1 2021-09-24 stsp return err;
8040 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8042 f259c4c1 2021-09-24 stsp return err;
8044 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8047 f259c4c1 2021-09-24 stsp goto done;
8049 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8051 f259c4c1 2021-09-24 stsp goto done;
8053 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8054 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8055 f259c4c1 2021-09-24 stsp goto done;
8058 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
8060 f259c4c1 2021-09-24 stsp goto done;
8062 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8064 f259c4c1 2021-09-24 stsp goto done;
8065 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
8067 f259c4c1 2021-09-24 stsp goto done;
8069 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8071 f259c4c1 2021-09-24 stsp goto done;
8072 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
8074 f259c4c1 2021-09-24 stsp goto done;
8077 f259c4c1 2021-09-24 stsp free(branch_refname);
8078 f259c4c1 2021-09-24 stsp free(commit_refname);
8079 f259c4c1 2021-09-24 stsp free(fileindex_path);
8080 f259c4c1 2021-09-24 stsp if (branch_ref)
8081 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8082 f259c4c1 2021-09-24 stsp if (commit_ref)
8083 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8084 f259c4c1 2021-09-24 stsp if (wt_branch)
8085 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
8086 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
8087 f259c4c1 2021-09-24 stsp if (err) {
8088 f259c4c1 2021-09-24 stsp if (*fileindex) {
8089 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8090 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8092 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8094 f259c4c1 2021-09-24 stsp return err;
8097 f259c4c1 2021-09-24 stsp const struct got_error *
8098 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
8099 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8100 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8102 f259c4c1 2021-09-24 stsp const struct got_error *err;
8103 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
8104 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8105 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8106 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
8108 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8109 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8110 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8112 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8114 f259c4c1 2021-09-24 stsp return err;
8116 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8118 f259c4c1 2021-09-24 stsp goto done;
8120 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8121 f259c4c1 2021-09-24 stsp &have_staged_files);
8122 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
8123 f259c4c1 2021-09-24 stsp goto done;
8124 f259c4c1 2021-09-24 stsp if (have_staged_files) {
8125 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
8126 f259c4c1 2021-09-24 stsp goto done;
8129 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8131 f259c4c1 2021-09-24 stsp goto done;
8133 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8135 f259c4c1 2021-09-24 stsp goto done;
8137 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8139 f259c4c1 2021-09-24 stsp goto done;
8141 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
8142 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8143 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
8144 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
8145 f259c4c1 2021-09-24 stsp goto done;
8147 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8148 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
8149 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
8150 f259c4c1 2021-09-24 stsp goto done;
8153 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8155 f259c4c1 2021-09-24 stsp goto done;
8157 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
8159 f259c4c1 2021-09-24 stsp goto done;
8161 f259c4c1 2021-09-24 stsp free(commit_refname);
8162 f259c4c1 2021-09-24 stsp free(branch_refname);
8163 f259c4c1 2021-09-24 stsp free(fileindex_path);
8164 f259c4c1 2021-09-24 stsp if (commit_ref)
8165 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8166 f259c4c1 2021-09-24 stsp if (branch_ref)
8167 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8168 f259c4c1 2021-09-24 stsp if (err) {
8169 f259c4c1 2021-09-24 stsp if (*branch_name) {
8170 f259c4c1 2021-09-24 stsp free(*branch_name);
8171 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8173 f259c4c1 2021-09-24 stsp free(*branch_tip);
8174 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8175 f259c4c1 2021-09-24 stsp if (*fileindex) {
8176 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8177 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8179 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8181 f259c4c1 2021-09-24 stsp return err;
8184 f259c4c1 2021-09-24 stsp const struct got_error *
8185 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
8186 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
8187 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8189 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
8190 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
8191 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
8192 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8193 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
8194 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
8196 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
8197 a44927cc 2022-04-07 stsp worktree->base_commit_id);
8199 a44927cc 2022-04-07 stsp goto done;
8201 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
8202 a44927cc 2022-04-07 stsp worktree->path_prefix);
8204 f259c4c1 2021-09-24 stsp goto done;
8206 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
8208 f259c4c1 2021-09-24 stsp goto done;
8210 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
8212 f259c4c1 2021-09-24 stsp goto done;
8214 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
8215 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
8216 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
8217 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
8218 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
8219 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
8220 f259c4c1 2021-09-24 stsp rfa.repo = repo;
8221 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
8222 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
8223 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
8225 f259c4c1 2021-09-24 stsp goto sync;
8227 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8228 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
8230 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8231 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8232 f259c4c1 2021-09-24 stsp err = sync_err;
8234 f259c4c1 2021-09-24 stsp free(tree_id);
8235 f259c4c1 2021-09-24 stsp free(commit_id);
8236 a44927cc 2022-04-07 stsp if (commit)
8237 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
8238 f259c4c1 2021-09-24 stsp if (fileindex)
8239 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
8240 f259c4c1 2021-09-24 stsp free(fileindex_path);
8242 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8243 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
8244 f259c4c1 2021-09-24 stsp err = unlockerr;
8245 f259c4c1 2021-09-24 stsp return err;
8248 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
8249 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
8250 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8251 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8252 2db2652d 2019-08-07 stsp struct got_repository *repo;
8253 2db2652d 2019-08-07 stsp int have_changes;
8256 336075a4 2022-06-25 op static const struct got_error *
8257 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
8258 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8259 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8260 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8262 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
8263 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
8264 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
8265 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
8266 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
8267 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
8269 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
8270 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
8271 8b13ce36 2019-08-08 stsp return NULL;
8272 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
8273 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
8275 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8276 735ef5ac 2019-08-03 stsp if (ie == NULL)
8277 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8279 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8280 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8281 735ef5ac 2019-08-03 stsp relpath) == -1)
8282 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
8284 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
8285 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
8286 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8287 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
8290 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
8291 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8292 3aa5969e 2019-08-06 stsp goto done;
8293 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
8294 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
8295 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
8296 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8297 735ef5ac 2019-08-03 stsp goto done;
8300 2db2652d 2019-08-07 stsp a->have_changes = 1;
8302 735ef5ac 2019-08-03 stsp p = in_repo_path;
8303 735ef5ac 2019-08-03 stsp while (p[0] == '/')
8305 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
8306 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
8307 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
8309 735ef5ac 2019-08-03 stsp free(in_repo_path);
8310 dc424a06 2019-08-07 stsp return err;
8313 2db2652d 2019-08-07 stsp struct stage_path_arg {
8314 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8315 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8316 2db2652d 2019-08-07 stsp struct got_repository *repo;
8317 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
8318 2db2652d 2019-08-07 stsp void *status_arg;
8319 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
8320 2db2652d 2019-08-07 stsp void *patch_arg;
8321 7b5dc508 2019-10-28 stsp int staged_something;
8322 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
8325 2db2652d 2019-08-07 stsp static const struct got_error *
8326 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
8327 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8328 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8329 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8331 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8332 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8333 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8334 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8335 0cb83759 2019-08-03 stsp uint32_t stage;
8336 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8337 0aeb8099 2020-07-23 stsp struct stat sb;
8339 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8340 8b13ce36 2019-08-08 stsp return NULL;
8342 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8343 d3e7c587 2019-08-03 stsp if (ie == NULL)
8344 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8346 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8347 2db2652d 2019-08-07 stsp relpath)== -1)
8348 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8350 0cb83759 2019-08-03 stsp switch (status) {
8351 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8352 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8353 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8354 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8355 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8358 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8359 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8360 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8361 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8362 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8365 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8368 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8369 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8370 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8371 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8372 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8376 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8377 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8380 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8381 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8382 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8383 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8385 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8386 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8387 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8388 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8389 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8390 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8391 35213c7c 2020-07-23 stsp ssize_t target_len;
8392 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8393 35213c7c 2020-07-23 stsp sizeof(target_path));
8394 35213c7c 2020-07-23 stsp if (target_len == -1) {
8395 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8396 35213c7c 2020-07-23 stsp ondisk_path);
8399 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8400 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8401 35213c7c 2020-07-23 stsp a->worktree->root_path);
8404 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8405 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8406 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8410 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8411 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8412 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8414 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8415 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8417 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8418 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8420 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8421 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8423 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8424 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8425 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8429 9fdde394 2022-06-04 op * When staging the reverse of the staged diff,
8430 9fdde394 2022-06-04 op * implicitly unstage the file.
8432 9fdde394 2022-06-04 op if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8433 9fdde394 2022-06-04 op sizeof(ie->blob_sha1)) == 0) {
8434 9fdde394 2022-06-04 op got_fileindex_entry_stage_set(ie,
8435 9fdde394 2022-06-04 op GOT_FILEIDX_STAGE_NONE);
8438 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8439 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8441 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8442 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8443 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8444 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8447 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8449 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8450 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8454 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8455 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8456 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8457 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8459 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8460 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8463 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8465 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8466 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8468 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8469 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8472 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8476 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8477 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8478 dc424a06 2019-08-07 stsp free(path_content);
8479 2db2652d 2019-08-07 stsp free(ondisk_path);
8480 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8481 0ebf8283 2019-07-24 stsp return err;
8484 0cb83759 2019-08-03 stsp const struct got_error *
8485 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8486 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8487 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8488 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8489 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8491 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8492 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8493 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8494 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8495 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8496 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8497 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8498 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8500 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8502 0cb83759 2019-08-03 stsp return err;
8504 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8505 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8507 735ef5ac 2019-08-03 stsp goto done;
8508 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8510 735ef5ac 2019-08-03 stsp goto done;
8511 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8513 0cb83759 2019-08-03 stsp goto done;
8515 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8516 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8517 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8518 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8519 2db2652d 2019-08-07 stsp oka.repo = repo;
8520 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8521 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8522 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8523 62da3196 2021-10-01 stsp check_stage_ok, &oka, NULL, NULL, 1, 0);
8525 735ef5ac 2019-08-03 stsp goto done;
8527 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8528 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8529 2db2652d 2019-08-07 stsp goto done;
8532 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8533 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8534 2db2652d 2019-08-07 stsp spa.repo = repo;
8535 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8536 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8537 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8538 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8539 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8540 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8541 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8542 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8543 62da3196 2021-10-01 stsp stage_path, &spa, NULL, NULL, 1, 0);
8545 2db2652d 2019-08-07 stsp goto done;
8547 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8548 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8549 7b5dc508 2019-10-28 stsp goto done;
8552 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8553 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8554 0cb83759 2019-08-03 stsp err = sync_err;
8556 735ef5ac 2019-08-03 stsp if (head_ref)
8557 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8558 735ef5ac 2019-08-03 stsp free(head_commit_id);
8559 0cb83759 2019-08-03 stsp free(fileindex_path);
8560 0cb83759 2019-08-03 stsp if (fileindex)
8561 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8562 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8563 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8564 0cb83759 2019-08-03 stsp err = unlockerr;
8565 0cb83759 2019-08-03 stsp return err;
8568 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8569 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8570 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8571 ad493afc 2019-08-03 stsp struct got_repository *repo;
8572 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8573 ad493afc 2019-08-03 stsp void *progress_arg;
8574 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8575 2e1f37b0 2019-08-08 stsp void *patch_arg;
8578 2e1f37b0 2019-08-08 stsp static const struct got_error *
8579 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8580 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8581 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8582 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8583 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8585 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8586 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8587 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8588 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8589 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8590 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8591 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8592 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8594 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8595 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8597 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8599 2e1f37b0 2019-08-08 stsp return err;
8601 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
8602 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
8603 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8604 eb81bc23 2022-06-28 tracey goto done;
8606 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
8607 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
8608 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8609 eb81bc23 2022-06-28 tracey goto done;
8612 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8614 2e1f37b0 2019-08-08 stsp goto done;
8616 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8618 2e1f37b0 2019-08-08 stsp goto done;
8620 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8622 2e1f37b0 2019-08-08 stsp goto done;
8624 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8627 2e1f37b0 2019-08-08 stsp goto done;
8629 b90054ed 2022-11-01 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8631 2e1f37b0 2019-08-08 stsp goto done;
8633 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8635 2e1f37b0 2019-08-08 stsp goto done;
8637 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8638 4b752015 2022-06-30 stsp path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8640 2e1f37b0 2019-08-08 stsp goto done;
8642 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8643 b90054ed 2022-11-01 stsp "got-unstaged-content", "");
8645 2e1f37b0 2019-08-08 stsp goto done;
8646 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8647 b90054ed 2022-11-01 stsp "got-new-staged-content", "");
8649 2e1f37b0 2019-08-08 stsp goto done;
8651 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8652 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8653 2e1f37b0 2019-08-08 stsp goto done;
8655 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8656 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8657 2e1f37b0 2019-08-08 stsp goto done;
8659 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8660 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8661 eb81bc23 2022-06-28 tracey struct diff_chunk_context cc = {};
8662 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8663 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8664 fe621944 2020-11-10 stsp nchanges++;
8666 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8667 2e1f37b0 2019-08-08 stsp int choice;
8668 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8669 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8670 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8671 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8673 2e1f37b0 2019-08-08 stsp goto done;
8674 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8675 2e1f37b0 2019-08-08 stsp have_content = 1;
8677 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8678 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8681 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8682 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8683 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8685 2e1f37b0 2019-08-08 stsp free(label1);
8686 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8687 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8689 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8690 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8691 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8692 2e1f37b0 2019-08-08 stsp if (staged_blob)
8693 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8694 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8695 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8696 fe621944 2020-11-10 stsp err = free_err;
8697 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8698 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8699 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8700 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8701 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8702 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8703 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8704 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8705 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8706 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8707 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8708 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8709 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8710 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8711 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8712 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8713 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8714 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8715 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8717 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8718 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8719 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8720 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8721 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8722 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8723 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8725 2e1f37b0 2019-08-08 stsp free(path1);
8726 2e1f37b0 2019-08-08 stsp free(path2);
8727 fda8017d 2020-07-23 stsp return err;
8730 fda8017d 2020-07-23 stsp static const struct got_error *
8731 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8732 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8733 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8734 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8735 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8736 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8737 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8739 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8740 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8741 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8742 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8743 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8744 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8745 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8746 fda8017d 2020-07-23 stsp struct stat sb;
8748 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8749 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8750 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8752 fda8017d 2020-07-23 stsp return err;
8754 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8755 fda8017d 2020-07-23 stsp return NULL;
8757 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8758 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8759 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8761 fda8017d 2020-07-23 stsp goto done;
8764 00fe21f2 2021-12-31 stsp f = fopen(path_unstaged_content, "re");
8765 fda8017d 2020-07-23 stsp if (f == NULL) {
8766 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8767 fda8017d 2020-07-23 stsp path_unstaged_content);
8768 fda8017d 2020-07-23 stsp goto done;
8770 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8771 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8772 fda8017d 2020-07-23 stsp goto done;
8774 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8775 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8776 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8778 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8779 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8780 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8781 fda8017d 2020-07-23 stsp goto done;
8783 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8784 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8785 fda8017d 2020-07-23 stsp goto done;
8787 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8788 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8789 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8790 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8791 fda8017d 2020-07-23 stsp progress_arg);
8793 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8795 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8797 67a66647 2021-05-31 stsp return err;
8799 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8800 67a66647 2021-05-31 stsp parent) == -1) {
8801 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8802 67a66647 2021-05-31 stsp base_path = NULL;
8803 67a66647 2021-05-31 stsp goto done;
8806 b90054ed 2022-11-01 stsp err = got_opentemp_named(&blob_base_path, &f_base,
8807 b90054ed 2022-11-01 stsp base_path, "");
8809 67a66647 2021-05-31 stsp goto done;
8810 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8811 67a66647 2021-05-31 stsp blob_base);
8813 67a66647 2021-05-31 stsp goto done;
8816 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8817 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8819 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8820 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8821 eec2f5a9 2021-06-03 stsp ondisk_path);
8823 eec2f5a9 2021-06-03 stsp goto done;
8826 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path,
8827 8bd0cdad 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8828 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8829 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8830 eec2f5a9 2021-06-03 stsp goto done;
8832 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8833 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8834 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8835 eec2f5a9 2021-06-03 stsp close(fd);
8836 eec2f5a9 2021-06-03 stsp goto done;
8840 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8841 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8842 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8843 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8844 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8847 fda8017d 2020-07-23 stsp goto done;
8849 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8850 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8851 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8853 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8854 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8857 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8858 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8859 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8860 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8861 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8862 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8863 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8864 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8865 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8866 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8867 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8868 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8869 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8870 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8871 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8872 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8873 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8874 67a66647 2021-05-31 stsp free(blob_base_path);
8875 67a66647 2021-05-31 stsp free(parent);
8876 67a66647 2021-05-31 stsp free(base_path);
8877 2e1f37b0 2019-08-08 stsp return err;
8880 ad493afc 2019-08-03 stsp static const struct got_error *
8881 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8882 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8883 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8884 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8886 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8887 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8888 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8889 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8890 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8891 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8892 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8893 9bc94a15 2019-08-03 stsp struct stat sb;
8894 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8896 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8897 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8898 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8899 2e1f37b0 2019-08-08 stsp return NULL;
8901 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8902 ad493afc 2019-08-03 stsp if (ie == NULL)
8903 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8905 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8907 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8909 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8910 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8912 f69721c3 2019-10-21 stsp goto done;
8913 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8914 f69721c3 2019-10-21 stsp id_str) == -1) {
8915 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8916 eb81bc23 2022-06-28 tracey goto done;
8919 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
8920 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
8921 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8922 eb81bc23 2022-06-28 tracey goto done;
8924 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
8925 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
8926 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8927 f69721c3 2019-10-21 stsp goto done;
8930 ad493afc 2019-08-03 stsp switch (staged_status) {
8931 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8932 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8933 eb81bc23 2022-06-28 tracey blob_id, 8192, fd1);
8936 ad493afc 2019-08-03 stsp /* fall through */
8937 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8938 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8939 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8940 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8941 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8942 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8945 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8948 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8949 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8950 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8951 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8952 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8953 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8956 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8957 eb81bc23 2022-06-28 tracey staged_blob_id, 8192, fd2);
8960 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8961 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8962 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8963 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8964 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8965 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8966 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8967 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8968 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8970 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8971 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8972 36bf999c 2020-07-23 stsp char *staged_target;
8973 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8974 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8976 36bf999c 2020-07-23 stsp goto done;
8977 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8978 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8979 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8980 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8981 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8982 36bf999c 2020-07-23 stsp free(staged_target);
8984 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8985 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8986 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8987 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8988 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8989 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8990 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8994 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8997 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8998 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8999 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
9000 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9003 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
9004 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
9005 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
9006 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
9007 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9010 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
9012 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
9013 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
9017 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9018 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9019 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
9020 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
9023 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
9027 ad493afc 2019-08-03 stsp free(ondisk_path);
9028 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9029 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9030 ad493afc 2019-08-03 stsp if (blob_base)
9031 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
9032 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9033 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9034 ad493afc 2019-08-03 stsp if (blob_staged)
9035 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
9036 f69721c3 2019-10-21 stsp free(id_str);
9037 f69721c3 2019-10-21 stsp free(label_orig);
9038 ad493afc 2019-08-03 stsp return err;
9041 ad493afc 2019-08-03 stsp const struct got_error *
9042 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
9043 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
9044 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
9045 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
9046 ad493afc 2019-08-03 stsp struct got_repository *repo)
9048 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
9049 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9050 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
9051 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
9052 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
9054 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
9056 ad493afc 2019-08-03 stsp return err;
9058 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9060 ad493afc 2019-08-03 stsp goto done;
9062 ad493afc 2019-08-03 stsp upa.worktree = worktree;
9063 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
9064 ad493afc 2019-08-03 stsp upa.repo = repo;
9065 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
9066 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
9067 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
9068 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
9069 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
9070 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
9071 62da3196 2021-10-01 stsp unstage_path, &upa, NULL, NULL, 1, 0);
9073 ad493afc 2019-08-03 stsp goto done;
9076 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
9077 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
9078 ad493afc 2019-08-03 stsp err = sync_err;
9080 ad493afc 2019-08-03 stsp free(fileindex_path);
9081 ad493afc 2019-08-03 stsp if (fileindex)
9082 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
9083 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
9084 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
9085 ad493afc 2019-08-03 stsp err = unlockerr;
9086 ad493afc 2019-08-03 stsp return err;
9089 b2118c49 2020-07-28 stsp struct report_file_info_arg {
9090 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
9091 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
9092 b2118c49 2020-07-28 stsp void *info_arg;
9093 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
9094 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
9095 b2118c49 2020-07-28 stsp void *cancel_arg;
9098 b2118c49 2020-07-28 stsp static const struct got_error *
9099 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
9101 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
9102 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9103 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
9104 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9105 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
9106 b2118c49 2020-07-28 stsp int stage;
9108 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9109 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
9111 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
9112 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9113 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
9116 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
9117 b2118c49 2020-07-28 stsp return NULL;
9119 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
9120 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
9121 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
9123 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
9124 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9125 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
9126 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
9127 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
9128 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
9131 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
9132 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
9133 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
9136 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9137 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9140 b2118c49 2020-07-28 stsp const struct got_error *
9141 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
9142 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
9143 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
9144 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
9147 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
9148 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
9149 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
9150 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
9152 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
9154 b2118c49 2020-07-28 stsp return err;
9156 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9158 b2118c49 2020-07-28 stsp goto done;
9160 b2118c49 2020-07-28 stsp arg.worktree = worktree;
9161 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
9162 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
9163 b2118c49 2020-07-28 stsp arg.paths = paths;
9164 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
9165 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
9166 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9169 b2118c49 2020-07-28 stsp free(fileindex_path);
9170 b2118c49 2020-07-28 stsp if (fileindex)
9171 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
9172 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
9173 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
9174 b2118c49 2020-07-28 stsp err = unlockerr;
9175 b2118c49 2020-07-28 stsp return err;
9178 78f5ac24 2022-03-19 op static const struct got_error *
9179 78f5ac24 2022-03-19 op patch_check_path(const char *p, char **path, unsigned char *status,
9180 78f5ac24 2022-03-19 op unsigned char *staged_status, struct got_fileindex *fileindex,
9181 78f5ac24 2022-03-19 op struct got_worktree *worktree, struct got_repository *repo)
9183 78f5ac24 2022-03-19 op const struct got_error *err;
9184 78f5ac24 2022-03-19 op struct got_fileindex_entry *ie;
9185 78f5ac24 2022-03-19 op struct stat sb;
9186 78f5ac24 2022-03-19 op char *ondisk_path = NULL;
9188 78f5ac24 2022-03-19 op err = got_worktree_resolve_path(path, worktree, p);
9192 78f5ac24 2022-03-19 op if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9193 78f5ac24 2022-03-19 op *path[0] ? "/" : "", *path) == -1)
9194 78f5ac24 2022-03-19 op return got_error_from_errno("asprintf");
9196 78f5ac24 2022-03-19 op ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9198 78f5ac24 2022-03-19 op *staged_status = get_staged_status(ie);
9199 a05fb460 2022-04-23 op err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9204 78f5ac24 2022-03-19 op *staged_status = GOT_STATUS_NO_CHANGE;
9205 78f5ac24 2022-03-19 op *status = GOT_STATUS_UNVERSIONED;
9206 78f5ac24 2022-03-19 op if (lstat(ondisk_path, &sb) == -1) {
9207 78f5ac24 2022-03-19 op if (errno != ENOENT) {
9208 78f5ac24 2022-03-19 op err = got_error_from_errno2("lstat",
9209 78f5ac24 2022-03-19 op ondisk_path);
9212 78f5ac24 2022-03-19 op *status = GOT_STATUS_NONEXISTENT;
9217 78f5ac24 2022-03-19 op free(ondisk_path);
9221 78f5ac24 2022-03-19 op static const struct got_error *
9222 78f5ac24 2022-03-19 op patch_can_rm(const char *path, unsigned char status,
9223 78f5ac24 2022-03-19 op unsigned char staged_status)
9225 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9226 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9227 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9228 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9229 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY &&
9230 78f5ac24 2022-03-19 op status != GOT_STATUS_MODE_CHANGE)
9231 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9232 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9233 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9234 78f5ac24 2022-03-19 op return NULL;
9237 78f5ac24 2022-03-19 op static const struct got_error *
9238 78f5ac24 2022-03-19 op patch_can_add(const char *path, unsigned char status)
9240 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NONEXISTENT)
9241 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9242 78f5ac24 2022-03-19 op return NULL;
9245 78f5ac24 2022-03-19 op static const struct got_error *
9246 78f5ac24 2022-03-19 op patch_can_edit(const char *path, unsigned char status,
9247 78f5ac24 2022-03-19 op unsigned char staged_status)
9249 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9250 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9251 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9252 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9253 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY)
9254 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9255 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9256 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9257 78f5ac24 2022-03-19 op return NULL;
9260 78f5ac24 2022-03-19 op const struct got_error *
9261 78f5ac24 2022-03-19 op got_worktree_patch_prepare(struct got_fileindex **fileindex,
9262 f2dd7807 2022-05-17 op char **fileindex_path, struct got_worktree *worktree)
9264 f2dd7807 2022-05-17 op return open_fileindex(fileindex, fileindex_path, worktree);
9267 78f5ac24 2022-03-19 op const struct got_error *
9268 78f5ac24 2022-03-19 op got_worktree_patch_check_path(const char *old, const char *new,
9269 78f5ac24 2022-03-19 op char **oldpath, char **newpath, struct got_worktree *worktree,
9270 78f5ac24 2022-03-19 op struct got_repository *repo, struct got_fileindex *fileindex)
9272 78f5ac24 2022-03-19 op const struct got_error *err = NULL;
9273 78f5ac24 2022-03-19 op int file_renamed = 0;
9274 78f5ac24 2022-03-19 op unsigned char status_old, staged_status_old;
9275 78f5ac24 2022-03-19 op unsigned char status_new, staged_status_new;
9277 78f5ac24 2022-03-19 op *oldpath = NULL;
9278 78f5ac24 2022-03-19 op *newpath = NULL;
9280 78f5ac24 2022-03-19 op err = patch_check_path(old != NULL ? old : new, oldpath,
9281 78f5ac24 2022-03-19 op &status_old, &staged_status_old, fileindex, worktree, repo);
9285 78f5ac24 2022-03-19 op err = patch_check_path(new != NULL ? new : old, newpath,
9286 78f5ac24 2022-03-19 op &status_new, &staged_status_new, fileindex, worktree, repo);
9290 78f5ac24 2022-03-19 op if (old != NULL && new != NULL && strcmp(old, new) != 0)
9291 78f5ac24 2022-03-19 op file_renamed = 1;
9293 78f5ac24 2022-03-19 op if (old != NULL && new == NULL)
9294 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9295 78f5ac24 2022-03-19 op else if (file_renamed) {
9296 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9297 78f5ac24 2022-03-19 op if (err == NULL)
9298 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9299 78f5ac24 2022-03-19 op } else if (old == NULL)
9300 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9302 78f5ac24 2022-03-19 op err = patch_can_edit(*newpath, status_new, staged_status_new);
9306 78f5ac24 2022-03-19 op free(*oldpath);
9307 78f5ac24 2022-03-19 op *oldpath = NULL;
9308 78f5ac24 2022-03-19 op free(*newpath);
9309 78f5ac24 2022-03-19 op *newpath = NULL;
9314 78f5ac24 2022-03-19 op const struct got_error *
9315 f2dd7807 2022-05-17 op got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9316 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9317 f2dd7807 2022-05-17 op got_worktree_checkout_cb progress_cb, void *progress_arg)
9319 f2dd7807 2022-05-17 op struct schedule_addition_args saa;
9321 f2dd7807 2022-05-17 op memset(&saa, 0, sizeof(saa));
9322 f2dd7807 2022-05-17 op saa.worktree = worktree;
9323 f2dd7807 2022-05-17 op saa.fileindex = fileindex;
9324 f2dd7807 2022-05-17 op saa.progress_cb = progress_cb;
9325 f2dd7807 2022-05-17 op saa.progress_arg = progress_arg;
9326 f2dd7807 2022-05-17 op saa.repo = repo;
9328 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9329 f2dd7807 2022-05-17 op schedule_addition, &saa, NULL, NULL, 1, 0);
9332 f2dd7807 2022-05-17 op const struct got_error *
9333 f2dd7807 2022-05-17 op got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9334 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9335 f2dd7807 2022-05-17 op got_worktree_delete_cb progress_cb, void *progress_arg)
9337 f2dd7807 2022-05-17 op struct schedule_deletion_args sda;
9339 f2dd7807 2022-05-17 op memset(&sda, 0, sizeof(sda));
9340 f2dd7807 2022-05-17 op sda.worktree = worktree;
9341 f2dd7807 2022-05-17 op sda.fileindex = fileindex;
9342 f2dd7807 2022-05-17 op sda.progress_cb = progress_cb;
9343 f2dd7807 2022-05-17 op sda.progress_arg = progress_arg;
9344 f2dd7807 2022-05-17 op sda.repo = repo;
9345 f2dd7807 2022-05-17 op sda.delete_local_mods = 0;
9346 f2dd7807 2022-05-17 op sda.keep_on_disk = 0;
9347 f2dd7807 2022-05-17 op sda.ignore_missing_paths = 0;
9348 f2dd7807 2022-05-17 op sda.status_codes = NULL;
9350 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9351 f2dd7807 2022-05-17 op schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9354 f2dd7807 2022-05-17 op const struct got_error *
9355 f2dd7807 2022-05-17 op got_worktree_patch_complete(struct got_fileindex *fileindex,
9356 4bcdc895 2022-05-17 op const char *fileindex_path)
9358 f2dd7807 2022-05-17 op const struct got_error *err = NULL;
9360 4bcdc895 2022-05-17 op err = sync_fileindex(fileindex, fileindex_path);
9361 4bcdc895 2022-05-17 op got_fileindex_free(fileindex);
