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 507dc3bb 2018-12-29 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 0e039681 2021-11-15 stsp base_path_orig);
562 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
563 0e039681 2021-11-15 stsp base_path_deriv);
566 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
567 0e039681 2021-11-15 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 af54ae4a 2019-02-19 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 11cc08c1 2020-07-23 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 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
998 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
999 67a66647 2021-05-31 stsp blob_orig);
1001 67a66647 2021-05-31 stsp goto done;
1002 67a66647 2021-05-31 stsp free(base_path);
1005 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1006 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1007 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1009 db590691 2021-06-02 stsp f_orig = got_opentemp();
1010 db590691 2021-06-02 stsp if (f_orig == NULL) {
1011 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1012 db590691 2021-06-02 stsp goto done;
1016 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1017 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1018 14c901f1 2019-08-08 stsp base_path = NULL;
1019 14c901f1 2019-08-08 stsp goto done;
1022 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1024 14c901f1 2019-08-08 stsp goto done;
1025 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1026 14c901f1 2019-08-08 stsp blob_deriv);
1028 14c901f1 2019-08-08 stsp goto done;
1030 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1032 14c901f1 2019-08-08 stsp goto done;
1033 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1034 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1035 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1036 14c901f1 2019-08-08 stsp goto done;
1040 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1041 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1043 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1044 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1046 eec2f5a9 2021-06-03 stsp goto done;
1049 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1050 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1051 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1052 eec2f5a9 2021-06-03 stsp goto done;
1054 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1055 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1056 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1057 eec2f5a9 2021-06-03 stsp close(fd);
1058 eec2f5a9 2021-06-03 stsp goto done;
1062 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1063 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1064 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1066 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1067 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1068 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1069 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1070 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1071 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1072 14c901f1 2019-08-08 stsp free(base_path);
1073 67a66647 2021-05-31 stsp if (blob_orig_path) {
1074 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1075 67a66647 2021-05-31 stsp free(blob_orig_path);
1077 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1078 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1079 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1081 6353ad76 2019-02-08 stsp free(id_str);
1082 818c7501 2019-07-11 stsp free(label_deriv);
1083 ed6b5030 2020-10-20 stsp free(parent);
1084 4a1ddfc2 2019-01-12 stsp return err;
1087 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1088 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1089 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1090 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1092 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1093 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1095 65b05cec 2020-07-23 stsp *new_iep = NULL;
1097 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1099 054041d0 2020-06-24 stsp return err;
1101 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1102 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1104 054041d0 2020-06-24 stsp goto done;
1106 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1109 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1111 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1112 13d9040b 2019-03-27 stsp return err;
1115 1ebedb77 2019-10-19 stsp static mode_t
1116 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1118 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1120 1ebedb77 2019-10-19 stsp if (executable) {
1121 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1122 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1123 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1124 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1125 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1126 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1129 b2b3fce1 2022-10-29 op return st_mode;
1132 b2b3fce1 2022-10-29 op static mode_t
1133 b2b3fce1 2022-10-29 op apply_umask(mode_t mode)
1137 b2b3fce1 2022-10-29 op um = umask(000);
1139 b2b3fce1 2022-10-29 op return mode & ~um;
1142 8ba819a3 2020-07-23 stsp /* forward declaration */
1143 13d9040b 2019-03-27 stsp static const struct got_error *
1144 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1145 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1146 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1147 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1148 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1149 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1152 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1153 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1155 8ba819a3 2020-07-23 stsp static const struct got_error *
1156 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1157 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1159 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1160 5a1fbc73 2020-07-23 stsp ssize_t elen;
1161 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1164 c6e8a826 2021-04-05 stsp *did_something = 0;
1167 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1168 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1169 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1170 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1171 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1172 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1174 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1175 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1176 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink())
1177 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1179 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1180 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1181 5a1fbc73 2020-07-23 stsp if (elen == -1)
1182 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1184 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1185 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1186 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1189 c6e8a826 2021-04-05 stsp *did_something = 1;
1190 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1191 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1192 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1193 5a1fbc73 2020-07-23 stsp return err;
1196 3c1ec782 2020-07-23 stsp static const struct got_error *
1197 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1198 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1200 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1201 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1202 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1204 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1206 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1207 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1208 3c1ec782 2020-07-23 stsp return NULL;
1212 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1213 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1214 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1215 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1216 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1218 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1219 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1220 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1222 ce031e9e 2020-10-20 stsp return err;
1223 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1224 ce031e9e 2020-10-20 stsp free(parent);
1225 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1227 ce031e9e 2020-10-20 stsp free(parent);
1228 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1229 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1230 3c1ec782 2020-07-23 stsp free(abspath);
1231 3c1ec782 2020-07-23 stsp return err;
1233 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1234 3c1ec782 2020-07-23 stsp free(abspath);
1236 3c1ec782 2020-07-23 stsp return err;
1238 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1240 3c1ec782 2020-07-23 stsp return err;
1243 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1244 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1245 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1246 3c1ec782 2020-07-23 stsp return NULL;
1249 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1250 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1251 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1252 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1253 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1254 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1256 3c1ec782 2020-07-23 stsp free(path_got);
1257 3c1ec782 2020-07-23 stsp return NULL;
1260 5a1fbc73 2020-07-23 stsp static const struct got_error *
1261 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1262 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1263 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1264 5267b9e4 2021-09-26 stsp int path_is_unversioned, int allow_bad_symlinks,
1265 5267b9e4 2021-09-26 stsp struct got_repository *repo,
1266 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1268 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1269 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1270 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1271 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1272 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1274 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1277 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1278 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1279 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1280 8ba819a3 2020-07-23 stsp * in the blob object.
1283 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1284 538b6881 2022-07-21 florian if (err)
1285 538b6881 2022-07-21 florian return err;
1287 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1288 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1289 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1290 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1291 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1292 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1293 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1294 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1295 3b9f0f87 2020-07-23 stsp progress_arg);
1297 8ba819a3 2020-07-23 stsp if (len > 0) {
1298 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1299 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1300 8ba819a3 2020-07-23 stsp len - hdrlen);
1301 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1302 8ba819a3 2020-07-23 stsp hdrlen = 0;
1304 8ba819a3 2020-07-23 stsp } while (len != 0);
1305 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1307 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1308 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1310 3c1ec782 2020-07-23 stsp return err;
1312 5267b9e4 2021-09-26 stsp if (*is_bad_symlink && !allow_bad_symlinks) {
1313 906c123b 2020-07-23 stsp /* install as a regular file */
1314 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1315 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1316 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1317 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1318 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1319 3c29341b 2022-07-21 florian return err;
1322 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1323 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1324 c6e8a826 2021-04-05 stsp int symlink_replaced;
1325 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1326 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1327 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1328 3c29341b 2022-07-21 florian return err;
1330 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1331 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1333 3c29341b 2022-07-21 florian return err;
1334 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1335 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1336 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1337 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1338 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1339 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1341 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1342 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1345 3c29341b 2022-07-21 florian return err; /* Nothing else to do. */
1348 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1349 f4994adc 2020-10-20 stsp char *parent;
1350 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1352 3c29341b 2022-07-21 florian return err;
1353 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1354 f4994adc 2020-10-20 stsp free(parent);
1356 3c29341b 2022-07-21 florian return err;
1358 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1359 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1361 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1362 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1363 3c29341b 2022-07-21 florian return err;
1367 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1368 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1369 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1370 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1371 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1372 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1373 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1374 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1375 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1376 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1377 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1378 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1379 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1381 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1382 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1384 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1385 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1386 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1387 8ba819a3 2020-07-23 stsp return err;
1390 8ba819a3 2020-07-23 stsp static const struct got_error *
1391 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1392 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1393 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1394 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1395 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1396 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1398 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1399 507dc3bb 2018-12-29 stsp int fd = -1;
1400 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1401 507dc3bb 2018-12-29 stsp int update = 0;
1402 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1403 b2b3fce1 2022-10-29 op mode_t mode;
1405 b2b3fce1 2022-10-29 op mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1406 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1407 b2b3fce1 2022-10-29 op O_CLOEXEC, mode);
1408 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1409 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1410 f5375317 2020-10-20 stsp char *parent;
1411 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1413 f5375317 2020-10-20 stsp return err;
1414 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1415 f5375317 2020-10-20 stsp free(parent);
1417 21908da4 2019-01-13 stsp return err;
1418 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1419 8bd0cdad 2021-12-31 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1421 21908da4 2019-01-13 stsp if (fd == -1)
1422 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1423 230a42bd 2019-05-11 jcs ondisk_path);
1424 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1425 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1426 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1427 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1428 3b9f0f87 2020-07-23 stsp goto done;
1430 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1431 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1432 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1433 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1434 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1435 507dc3bb 2018-12-29 stsp goto done;
1437 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1438 507dc3bb 2018-12-29 stsp ondisk_path);
1440 507dc3bb 2018-12-29 stsp goto done;
1441 507dc3bb 2018-12-29 stsp update = 1;
1443 b2b3fce1 2022-10-29 op if (fchmod(fd, apply_umask(mode)) == -1) {
1444 b2b3fce1 2022-10-29 op err = got_error_from_errno2("fchmod",
1450 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1453 bd6aa359 2020-07-23 stsp if (progress_cb) {
1454 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1455 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1457 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1458 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1461 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1462 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1464 bd6aa359 2020-07-23 stsp goto done;
1467 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1469 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1470 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1473 9d31a1d8 2018-03-11 stsp if (len > 0) {
1474 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1475 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1476 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1477 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1478 b87c6f83 2018-12-24 stsp goto done;
1479 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1480 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1481 b87c6f83 2018-12-24 stsp goto done;
1483 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1485 9d31a1d8 2018-03-11 stsp } while (len != 0);
1487 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1488 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1489 816dc654 2019-02-16 stsp goto done;
1492 507dc3bb 2018-12-29 stsp if (update) {
1493 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1494 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1495 f6d8c0ac 2020-11-09 stsp goto done;
1497 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1498 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1499 230a42bd 2019-05-11 jcs ondisk_path);
1500 68ed9ba5 2019-02-10 stsp goto done;
1502 63df146d 2020-11-09 stsp free(tmppath);
1503 63df146d 2020-11-09 stsp tmppath = NULL;
1507 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1508 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1509 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1510 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1511 507dc3bb 2018-12-29 stsp free(tmppath);
1512 6353ad76 2019-02-08 stsp return err;
1515 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1516 6353ad76 2019-02-08 stsp static const struct got_error *
1517 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1519 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1520 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1521 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1522 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1523 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1525 7154f6ce 2019-03-27 stsp int i = 0;
1526 9bdd68dd 2021-01-02 naddy char *line = NULL;
1527 9bdd68dd 2021-01-02 naddy size_t linesize = 0;
1528 9bdd68dd 2021-01-02 naddy ssize_t linelen;
1530 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1531 9bdd68dd 2021-01-02 naddy linelen = getline(&line, &linesize, f);
1532 9bdd68dd 2021-01-02 naddy if (linelen == -1) {
1533 7154f6ce 2019-03-27 stsp if (feof(f))
1535 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1539 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1540 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1542 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1547 9bdd68dd 2021-01-02 naddy free(line);
1549 7154f6ce 2019-03-27 stsp return err;
1552 e2b1e152 2019-07-13 stsp static int
1553 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1555 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1556 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1559 1ebedb77 2019-10-19 stsp static int
1560 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1562 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1563 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1564 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1565 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1566 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1567 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1570 c363b2c1 2019-08-03 stsp static unsigned char
1571 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1573 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1574 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1575 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1576 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1577 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1578 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1579 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1581 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1585 a919d5c4 2020-07-23 stsp static const struct got_error *
1586 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1587 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1588 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1590 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1591 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1592 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1593 a919d5c4 2020-07-23 stsp ssize_t elen;
1594 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1595 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1596 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1598 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1600 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1602 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1604 a919d5c4 2020-07-23 stsp return err;
1605 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1607 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1608 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1610 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1612 a919d5c4 2020-07-23 stsp if (len > 0) {
1613 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1614 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1615 a919d5c4 2020-07-23 stsp len - hdrlen);
1616 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1617 a919d5c4 2020-07-23 stsp hdrlen = 0;
1619 a919d5c4 2020-07-23 stsp } while (len != 0);
1620 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1622 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1623 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1624 a919d5c4 2020-07-23 stsp if (elen == -1)
1625 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1627 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1628 a919d5c4 2020-07-23 stsp if (elen == -1)
1629 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1632 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1633 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1635 a919d5c4 2020-07-23 stsp return NULL;
1638 7154f6ce 2019-03-27 stsp static const struct got_error *
1639 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1640 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1641 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1643 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1644 6353ad76 2019-02-08 stsp struct got_object_id id;
1645 6353ad76 2019-02-08 stsp size_t hdrlen;
1646 eb81bc23 2022-06-28 tracey int fd = -1, fd1 = -1;
1647 6353ad76 2019-02-08 stsp FILE *f = NULL;
1648 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1649 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1650 6353ad76 2019-02-08 stsp size_t flen, blen;
1651 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1653 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1654 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1657 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1658 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1659 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1661 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1662 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1663 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1664 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1665 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1667 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1668 882ef1b9 2019-12-13 stsp goto done;
1670 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1671 3d35a492 2019-12-13 stsp goto done;
1674 8bd0cdad 2021-12-31 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1675 5c02d2a5 2021-09-26 stsp if (fd == -1 && errno != ENOENT &&
1676 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
1677 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1678 5c02d2a5 2021-09-26 stsp else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1679 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1680 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1681 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1682 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1683 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1684 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1686 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1687 3d35a492 2019-12-13 stsp goto done;
1689 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1690 1338848f 2019-12-13 stsp goto done;
1694 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1695 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1696 1338848f 2019-12-13 stsp goto done;
1699 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1700 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1701 1338848f 2019-12-13 stsp goto done;
1702 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1703 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1704 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1705 1338848f 2019-12-13 stsp goto done;
1708 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1709 f179e66d 2020-07-23 stsp goto done;
1711 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1712 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1713 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1714 1338848f 2019-12-13 stsp goto done;
1717 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1718 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1719 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1721 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1723 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1724 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1725 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1726 eb81bc23 2022-06-28 tracey goto done;
1728 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1730 1338848f 2019-12-13 stsp goto done;
1732 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1733 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1734 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1735 a919d5c4 2020-07-23 stsp goto done;
1738 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1739 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1740 ab0d4361 2019-12-13 stsp if (fd == -1) {
1741 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1742 ab0d4361 2019-12-13 stsp goto done;
1746 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1747 6353ad76 2019-02-08 stsp if (f == NULL) {
1748 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1749 6353ad76 2019-02-08 stsp goto done;
1752 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1754 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1755 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1757 7154f6ce 2019-03-27 stsp goto done;
1758 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1759 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1760 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1761 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1762 7154f6ce 2019-03-27 stsp goto done;
1764 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1765 6353ad76 2019-02-08 stsp if (flen != 0)
1766 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1768 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1769 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1770 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1772 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1773 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1774 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1775 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1779 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1782 6353ad76 2019-02-08 stsp hdrlen = 0;
1785 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1786 7154f6ce 2019-03-27 stsp rewind(f);
1787 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1788 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1789 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1791 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1792 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
1794 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1795 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1796 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1797 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1798 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1799 9d31a1d8 2018-03-11 stsp return err;
1803 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1804 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1806 e2b1e152 2019-07-13 stsp static const struct got_error *
1807 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1808 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1810 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1811 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1812 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1814 e2b1e152 2019-07-13 stsp return NULL;
1817 9d31a1d8 2018-03-11 stsp static const struct got_error *
1818 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1819 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1820 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1821 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1822 0584f854 2019-04-06 stsp void *progress_arg)
1824 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1825 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1826 eb81bc23 2022-06-28 tracey char *ondisk_path = NULL;
1827 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1828 b8f41171 2019-02-10 stsp struct stat sb;
1829 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
1831 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1832 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1835 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1836 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1837 a76c42e6 2019-08-03 stsp goto done;
1839 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1842 abb4604f 2019-07-27 stsp goto done;
1843 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1844 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1846 f6764181 2021-09-24 stsp if (stat(ondisk_path, &sb) == -1) {
1847 f6764181 2021-09-24 stsp if (errno != ENOENT) {
1848 f6764181 2021-09-24 stsp err = got_error_from_errno2("stat",
1849 f6764181 2021-09-24 stsp ondisk_path);
1850 f6764181 2021-09-24 stsp goto done;
1852 f6764181 2021-09-24 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1853 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1855 f6764181 2021-09-24 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1856 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1858 f6764181 2021-09-24 stsp status = GOT_STATUS_OBSTRUCTED;
1862 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1864 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1865 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1866 b8f41171 2019-02-10 stsp goto done;
1868 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1870 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1871 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1873 5036ab18 2020-04-18 stsp goto done;
1876 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1877 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1878 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1880 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1881 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1882 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1883 c6e8a826 2021-04-05 stsp * updating contents of this file.
1885 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1886 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1887 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1888 c6e8a826 2021-04-05 stsp /* Same commit. */
1889 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1890 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1892 e2b1e152 2019-07-13 stsp goto done;
1893 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1895 6353ad76 2019-02-08 stsp goto done;
1897 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1898 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1899 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1900 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1901 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1902 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1904 0f58026f 2021-04-05 stsp goto done;
1905 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1907 b8f41171 2019-02-10 stsp goto done;
1911 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
1912 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
1913 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1914 eb81bc23 2022-06-28 tracey goto done;
1916 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1918 6353ad76 2019-02-08 stsp goto done;
1920 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1921 234035bc 2019-06-01 stsp int update_timestamps;
1922 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1923 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1924 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1925 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
1926 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
1927 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
1928 eb81bc23 2022-06-28 tracey goto done;
1930 234035bc 2019-06-01 stsp struct got_object_id id2;
1931 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1932 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1935 f69721c3 2019-10-21 stsp goto done;
1937 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1938 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1939 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1940 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1941 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1942 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1943 f69721c3 2019-10-21 stsp goto done;
1945 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1946 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1947 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1948 234035bc 2019-06-01 stsp goto done;
1951 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1952 36bf999c 2020-07-23 stsp char *link_target;
1953 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1955 36bf999c 2020-07-23 stsp goto done;
1956 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1957 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1958 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1959 36bf999c 2020-07-23 stsp free(link_target);
1961 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1962 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1963 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1964 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1966 f69721c3 2019-10-21 stsp free(label_orig);
1967 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1968 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
1969 eb81bc23 2022-06-28 tracey goto done;
1971 234035bc 2019-06-01 stsp if (blob2)
1972 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1974 909d120e 2019-09-22 stsp goto done;
1976 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1977 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1978 234035bc 2019-06-01 stsp * unmodified files again.
1980 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1981 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1982 234035bc 2019-06-01 stsp update_timestamps);
1983 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1984 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1985 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1986 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1987 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1989 1ee397ad 2019-07-12 stsp goto done;
1990 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1991 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1993 13d9040b 2019-03-27 stsp goto done;
1995 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1996 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1997 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1998 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1999 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2000 5267b9e4 2021-09-26 stsp status == GOT_STATUS_UNVERSIONED, 0,
2001 5267b9e4 2021-09-26 stsp repo, progress_cb, progress_arg);
2003 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2004 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2005 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2006 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2007 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2010 13d9040b 2019-03-27 stsp goto done;
2013 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2014 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2015 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2017 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2018 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2019 054041d0 2020-06-24 stsp &blob->id);
2022 13d9040b 2019-03-27 stsp goto done;
2024 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2025 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2026 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2030 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2031 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
2032 eb81bc23 2022-06-28 tracey goto done;
2034 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2036 6353ad76 2019-02-08 stsp free(ondisk_path);
2037 8da9e5f4 2019-01-12 stsp return err;
2040 90285c3b 2019-01-08 stsp static const struct got_error *
2041 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2043 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2044 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2046 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2047 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2049 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2050 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2051 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2053 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2054 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2056 1c4cdd89 2021-06-20 stsp goto done;
2057 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2058 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2059 fddefe3b 2020-10-20 stsp free(ondisk_path);
2060 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2061 1c4cdd89 2021-06-20 stsp parent = NULL;
2062 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2063 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2064 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2065 fddefe3b 2020-10-20 stsp ondisk_path);
2068 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2074 90285c3b 2019-01-08 stsp free(ondisk_path);
2075 1c4cdd89 2021-06-20 stsp free(parent);
2076 90285c3b 2019-01-08 stsp return err;
2079 708d8e67 2019-03-27 stsp static const struct got_error *
2080 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2081 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2082 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2084 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2085 708d8e67 2019-03-27 stsp unsigned char status;
2086 708d8e67 2019-03-27 stsp struct stat sb;
2087 708d8e67 2019-03-27 stsp char *ondisk_path;
2089 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2090 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2092 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2094 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2096 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2098 5a58a424 2020-06-23 stsp goto done;
2100 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2101 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2102 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2103 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2104 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2105 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2106 993e2a1b 2020-07-23 stsp goto done;
2108 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2109 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2110 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2111 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2113 993e2a1b 2020-07-23 stsp goto done;
2114 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2115 993e2a1b 2020-07-23 stsp ie->path);
2116 993e2a1b 2020-07-23 stsp goto done;
2119 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2120 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2121 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2123 5a58a424 2020-06-23 stsp goto done;
2125 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2126 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2128 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2129 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2131 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2133 5a58a424 2020-06-23 stsp goto done;
2134 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2135 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2137 5a58a424 2020-06-23 stsp goto done;
2139 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2142 5a58a424 2020-06-23 stsp free(ondisk_path);
2143 fc6346c4 2019-03-27 stsp return err;
2146 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2147 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2148 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2149 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2150 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2151 8da9e5f4 2019-01-12 stsp void *progress_arg;
2152 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2153 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2156 512f0d0e 2019-01-02 stsp static const struct got_error *
2157 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2158 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2160 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2162 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2163 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2165 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2166 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2169 8da9e5f4 2019-01-12 stsp static const struct got_error *
2170 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2172 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2174 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2175 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2177 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2178 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2181 9d31a1d8 2018-03-11 stsp static const struct got_error *
2182 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2184 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2185 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2186 8da9e5f4 2019-01-12 stsp char *path;
2188 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2189 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2191 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2192 63c5ca5d 2019-08-24 stsp return NULL;
2194 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2195 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2197 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2199 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2200 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2202 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2203 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2205 8da9e5f4 2019-01-12 stsp free(path);
2206 0cd1c46a 2019-03-11 stsp return err;
2209 b2118c49 2020-07-28 stsp const struct got_error *
2210 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2212 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2214 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2215 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2216 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2217 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2220 b2118c49 2020-07-28 stsp return NULL;
2223 818c7501 2019-07-11 stsp static const struct got_error *
2224 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2226 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2227 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2229 517bab73 2019-03-11 stsp *refname = NULL;
2231 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2233 b2118c49 2020-07-28 stsp return err;
2235 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2236 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2237 0647c563 2019-03-11 stsp *refname = NULL;
2239 517bab73 2019-03-11 stsp free(uuidstr);
2240 517bab73 2019-03-11 stsp return err;
2243 818c7501 2019-07-11 stsp const struct got_error *
2244 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2246 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2249 818c7501 2019-07-11 stsp static const struct got_error *
2250 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2252 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2253 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2256 818c7501 2019-07-11 stsp static const struct got_error *
2257 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2259 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2262 818c7501 2019-07-11 stsp static const struct got_error *
2263 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2265 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2266 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2269 818c7501 2019-07-11 stsp static const struct got_error *
2270 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2272 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2273 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2276 0ebf8283 2019-07-24 stsp static const struct got_error *
2277 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2279 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2280 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2283 0ebf8283 2019-07-24 stsp static const struct got_error *
2284 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2286 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2287 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2290 0ebf8283 2019-07-24 stsp static const struct got_error *
2291 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2293 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2294 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2297 0ebf8283 2019-07-24 stsp static const struct got_error *
2298 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2300 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2301 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2304 0ebf8283 2019-07-24 stsp const struct got_error *
2305 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2306 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2308 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2309 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2310 0ebf8283 2019-07-24 stsp *path = NULL;
2311 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2313 0ebf8283 2019-07-24 stsp return NULL;
2316 f259c4c1 2021-09-24 stsp static const struct got_error *
2317 f259c4c1 2021-09-24 stsp get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2319 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2320 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2323 f259c4c1 2021-09-24 stsp static const struct got_error *
2324 f259c4c1 2021-09-24 stsp get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2326 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2327 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2331 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2332 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2334 517bab73 2019-03-11 stsp static const struct got_error *
2335 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2337 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2338 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2339 517bab73 2019-03-11 stsp char *refname;
2341 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2343 517bab73 2019-03-11 stsp return err;
2345 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2347 0cd1c46a 2019-03-11 stsp goto done;
2349 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2351 0cd1c46a 2019-03-11 stsp free(refname);
2353 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2354 3e3a69f1 2019-07-25 stsp return err;
2357 3e3a69f1 2019-07-25 stsp static const struct got_error *
2358 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2360 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2362 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2363 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2364 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2365 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2367 9d31a1d8 2018-03-11 stsp return err;
2371 ebf99748 2019-05-09 stsp static const struct got_error *
2372 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2373 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2375 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2376 ebf99748 2019-05-09 stsp FILE *index = NULL;
2378 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2379 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2380 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2381 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2383 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2385 ebf99748 2019-05-09 stsp goto done;
2387 00fe21f2 2021-12-31 stsp index = fopen(*fileindex_path, "rbe");
2388 ebf99748 2019-05-09 stsp if (index == NULL) {
2389 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2390 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2392 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2393 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2394 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2397 ebf99748 2019-05-09 stsp if (err) {
2398 ebf99748 2019-05-09 stsp free(*fileindex_path);
2399 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2400 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2401 ebf99748 2019-05-09 stsp *fileindex = NULL;
2403 ebf99748 2019-05-09 stsp return err;
2406 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2407 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2408 c932eeeb 2019-05-22 stsp const char *path;
2409 c932eeeb 2019-05-22 stsp size_t path_len;
2410 c932eeeb 2019-05-22 stsp const char *entry_name;
2411 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2412 a484d721 2019-06-10 stsp void *progress_arg;
2415 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2416 c932eeeb 2019-05-22 stsp static const struct got_error *
2417 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2419 1ee397ad 2019-07-12 stsp const struct got_error *err;
2420 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2422 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2423 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2424 c932eeeb 2019-05-22 stsp return NULL;
2425 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2426 102ff934 2019-06-11 stsp return NULL;
2428 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2429 a769b60b 2021-06-27 stsp return NULL;
2431 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2432 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2433 c932eeeb 2019-05-22 stsp return NULL;
2435 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2436 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2437 edd02c5e 2019-07-11 stsp ie->path);
2439 1ee397ad 2019-07-12 stsp return err;
2441 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2442 c932eeeb 2019-05-22 stsp return NULL;
2445 a615e0e7 2020-12-16 stsp static const struct got_error *
2446 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2447 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2448 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2450 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2452 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2453 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2454 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2455 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2456 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2457 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2459 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2460 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2463 9c6338c4 2019-06-02 stsp static const struct got_error *
2464 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2466 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2467 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2468 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2469 867630bb 2020-01-17 stsp struct timespec timeout;
2471 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2472 9c6338c4 2019-06-02 stsp fileindex_path);
2474 9c6338c4 2019-06-02 stsp goto done;
2476 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2478 9c6338c4 2019-06-02 stsp goto done;
2480 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2481 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2482 9c6338c4 2019-06-02 stsp fileindex_path);
2483 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2487 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2488 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2489 867630bb 2020-01-17 stsp * was recorded in the file index.
2491 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2492 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2493 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2495 9c6338c4 2019-06-02 stsp if (new_index)
2496 9c6338c4 2019-06-02 stsp fclose(new_index);
2497 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2498 9c6338c4 2019-06-02 stsp return err;
2501 6ced4176 2019-07-12 stsp static const struct got_error *
2502 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2503 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2504 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit, struct got_worktree *worktree,
2505 a44927cc 2022-04-07 stsp struct got_repository *repo)
2507 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2508 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2509 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2510 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2512 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2513 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2514 6ced4176 2019-07-12 stsp *tree_id = NULL;
2516 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2517 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2518 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2519 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2520 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2521 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2522 6ced4176 2019-07-12 stsp goto done;
2524 a44927cc 2022-04-07 stsp err = got_object_id_by_path(tree_id, repo, base_commit,
2525 a44927cc 2022-04-07 stsp worktree->path_prefix);
2527 6ced4176 2019-07-12 stsp goto done;
2528 6ced4176 2019-07-12 stsp return NULL;
2531 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2533 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2534 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2535 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2536 6ced4176 2019-07-12 stsp goto done;
2539 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2541 6ced4176 2019-07-12 stsp goto done;
2543 6ced4176 2019-07-12 stsp free(in_repo_path);
2544 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2546 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2548 6ced4176 2019-07-12 stsp goto done;
2550 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2551 6ced4176 2019-07-12 stsp /* Check out a single file. */
2552 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2553 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2554 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2555 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2556 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2557 6ced4176 2019-07-12 stsp goto done;
2559 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2560 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2561 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2562 6ced4176 2019-07-12 stsp goto done;
2565 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2566 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2568 6ced4176 2019-07-12 stsp return err;
2569 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2570 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2571 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2572 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2573 6ced4176 2019-07-12 stsp goto done;
2576 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2577 a44927cc 2022-04-07 stsp base_commit, in_repo_path);
2579 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2580 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2581 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2582 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2583 6ced4176 2019-07-12 stsp goto done;
2585 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2586 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2587 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2588 6ced4176 2019-07-12 stsp goto done;
2593 6ced4176 2019-07-12 stsp free(in_repo_path);
2594 6ced4176 2019-07-12 stsp if (err) {
2595 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2596 6ced4176 2019-07-12 stsp free(*tree_relpath);
2597 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2598 6ced4176 2019-07-12 stsp free(*tree_id);
2599 6ced4176 2019-07-12 stsp *tree_id = NULL;
2601 07ed472d 2019-07-12 stsp return err;
2604 07ed472d 2019-07-12 stsp static const struct got_error *
2605 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2606 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2607 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2608 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2610 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2611 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2612 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2613 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2614 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2616 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2617 7f47418f 2019-12-20 stsp if (err) {
2618 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2619 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2620 7f47418f 2019-12-20 stsp goto done;
2621 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2622 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2624 7f47418f 2019-12-20 stsp return err;
2627 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2628 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2630 07ed472d 2019-07-12 stsp goto done;
2632 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2634 07ed472d 2019-07-12 stsp goto done;
2636 07ed472d 2019-07-12 stsp if (entry_name &&
2637 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2638 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2639 07ed472d 2019-07-12 stsp goto done;
2642 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2643 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2644 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2645 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2646 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2647 07ed472d 2019-07-12 stsp arg.repo = repo;
2648 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2649 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2650 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2651 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2652 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2653 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2656 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2657 07ed472d 2019-07-12 stsp if (commit)
2658 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2659 6ced4176 2019-07-12 stsp return err;
2662 9d31a1d8 2018-03-11 stsp const struct got_error *
2663 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2664 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2665 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2666 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2668 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2669 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2670 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2671 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2672 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2673 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2674 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2675 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2676 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2677 f2ea84fa 2019-07-27 stsp int entry_type;
2678 f2ea84fa 2019-07-27 stsp char *relpath;
2679 f2ea84fa 2019-07-27 stsp char *entry_name;
2680 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2681 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2683 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2685 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2687 9d31a1d8 2018-03-11 stsp return err;
2689 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
2690 a44927cc 2022-04-07 stsp worktree->base_commit_id);
2692 a44927cc 2022-04-07 stsp goto done;
2694 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2695 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2696 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2697 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2698 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2699 f2ea84fa 2019-07-27 stsp goto done;
2702 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2703 a44927cc 2022-04-07 stsp &tpd->relpath, &tpd->tree_id, pe->path, commit,
2704 a44927cc 2022-04-07 stsp worktree, repo);
2705 f2ea84fa 2019-07-27 stsp if (err) {
2706 f2ea84fa 2019-07-27 stsp free(tpd);
2707 6ced4176 2019-07-12 stsp goto done;
2710 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2711 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2712 f2ea84fa 2019-07-27 stsp if (err) {
2713 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2714 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2715 f2ea84fa 2019-07-27 stsp free(tpd);
2716 f2ea84fa 2019-07-27 stsp goto done;
2719 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2721 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2725 51514078 2018-12-25 stsp * Read the file index.
2726 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2727 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2729 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2731 c4cdcb68 2019-04-03 stsp goto done;
2733 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2734 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2735 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2737 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2738 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2739 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2743 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2744 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2745 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2746 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2747 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2748 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2749 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2750 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2754 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2756 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2757 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2758 af12c6b9 2019-06-04 stsp err = sync_err;
2760 9c6338c4 2019-06-02 stsp free(fileindex_path);
2762 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2763 9d31a1d8 2018-03-11 stsp if (commit)
2764 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2765 5ade8233 2019-07-12 stsp if (fileindex)
2766 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2767 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2768 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2769 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2770 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2771 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2772 f2ea84fa 2019-07-27 stsp free(tpd);
2774 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2775 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2776 9d31a1d8 2018-03-11 stsp err = unlockerr;
2777 f8d1f275 2019-02-04 stsp return err;
2780 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2781 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2782 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2783 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2784 234035bc 2019-06-01 stsp void *progress_arg;
2785 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2786 234035bc 2019-06-01 stsp void *cancel_arg;
2787 f69721c3 2019-10-21 stsp const char *label_orig;
2788 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2789 5267b9e4 2021-09-26 stsp int allow_bad_symlinks;
2792 234035bc 2019-06-01 stsp static const struct got_error *
2793 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2794 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
2795 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
2796 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
2797 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2799 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2800 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2801 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2802 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2803 234035bc 2019-06-01 stsp struct stat sb;
2804 234035bc 2019-06-01 stsp unsigned char status;
2805 234035bc 2019-06-01 stsp int local_changes_subsumed;
2806 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2807 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2809 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2810 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2811 d6c87207 2019-08-02 stsp strlen(path2));
2812 1ee397ad 2019-07-12 stsp if (ie == NULL)
2813 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2814 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2816 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2817 234035bc 2019-06-01 stsp path2) == -1)
2818 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2820 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2823 234035bc 2019-06-01 stsp goto done;
2825 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2826 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2827 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2828 234035bc 2019-06-01 stsp goto done;
2830 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2831 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2832 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2833 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2834 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2835 234035bc 2019-06-01 stsp goto done;
2838 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2839 36bf999c 2020-07-23 stsp char *link_target2;
2840 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2842 36bf999c 2020-07-23 stsp goto done;
2843 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2844 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2845 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2846 36bf999c 2020-07-23 stsp free(link_target2);
2850 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2851 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2852 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2853 1af628f4 2021-06-03 stsp goto done;
2855 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2856 1af628f4 2021-06-03 stsp f_orig, blob1);
2858 1af628f4 2021-06-03 stsp goto done;
2860 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2861 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2862 1af628f4 2021-06-03 stsp goto done;
2863 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2864 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2866 1af628f4 2021-06-03 stsp goto done;
2868 c0df5966 2021-12-31 stsp fd = open(ondisk_path,
2869 c0df5966 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2870 1af628f4 2021-06-03 stsp if (fd == -1) {
2871 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2872 1af628f4 2021-06-03 stsp ondisk_path);
2873 1af628f4 2021-06-03 stsp goto done;
2875 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2876 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2877 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2878 1af628f4 2021-06-03 stsp ondisk_path);
2879 1af628f4 2021-06-03 stsp close(fd);
2880 1af628f4 2021-06-03 stsp goto done;
2882 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2884 1af628f4 2021-06-03 stsp goto done;
2885 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2886 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2887 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2888 1af628f4 2021-06-03 stsp goto done;
2890 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2891 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2892 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2893 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2894 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2896 234035bc 2019-06-01 stsp } else if (blob1) {
2897 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2898 d6c87207 2019-08-02 stsp strlen(path1));
2899 1ee397ad 2019-07-12 stsp if (ie == NULL)
2900 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2901 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2903 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2904 2b92fad7 2019-06-02 stsp path1) == -1)
2905 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2907 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2910 2b92fad7 2019-06-02 stsp goto done;
2912 2b92fad7 2019-06-02 stsp switch (status) {
2913 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2914 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2915 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2917 1ee397ad 2019-07-12 stsp goto done;
2918 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2920 2b92fad7 2019-06-02 stsp goto done;
2922 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2924 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2925 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2926 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2927 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2929 1ee397ad 2019-07-12 stsp goto done;
2931 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2933 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2934 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2935 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2936 72840534 2022-01-19 stsp off_t blob1_size;
2938 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2939 0a22ca1a 2020-09-23 stsp * exists in the repository.
2941 72840534 2022-01-19 stsp err = got_object_blob_file_create(&id, &blob1_f,
2942 72840534 2022-01-19 stsp &blob1_size, path1);
2944 0a22ca1a 2020-09-23 stsp goto done;
2945 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2946 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2947 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2949 0a22ca1a 2020-09-23 stsp goto done;
2950 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2953 0a22ca1a 2020-09-23 stsp goto done;
2955 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2958 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2959 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2961 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2962 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2965 0a22ca1a 2020-09-23 stsp goto done;
2968 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2969 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2970 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2971 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2973 1ee397ad 2019-07-12 stsp goto done;
2975 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2976 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2978 1ee397ad 2019-07-12 stsp goto done;
2983 234035bc 2019-06-01 stsp } else if (blob2) {
2984 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2985 234035bc 2019-06-01 stsp path2) == -1)
2986 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2987 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2988 d6c87207 2019-08-02 stsp strlen(path2));
2990 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2991 7f91a133 2019-12-13 stsp -1, NULL, repo);
2993 234035bc 2019-06-01 stsp goto done;
2994 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2995 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2996 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2997 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2998 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2999 1ee397ad 2019-07-12 stsp status, path2);
3000 234035bc 2019-06-01 stsp goto done;
3002 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3003 36bf999c 2020-07-23 stsp char *link_target2;
3004 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3007 36bf999c 2020-07-23 stsp goto done;
3008 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3009 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3010 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3011 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3012 36bf999c 2020-07-23 stsp free(link_target2);
3013 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3014 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3015 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3016 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3017 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3018 526a746f 2020-07-23 stsp a->progress_arg);
3020 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3021 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3024 dfe9fba0 2020-07-23 stsp goto done;
3025 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3026 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3027 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3028 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3030 234035bc 2019-06-01 stsp goto done;
3033 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3034 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3035 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3036 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3037 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3038 5267b9e4 2021-09-26 stsp 0, 1, a->allow_bad_symlinks, repo,
3039 5267b9e4 2021-09-26 stsp a->progress_cb, a->progress_arg);
3041 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3042 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3043 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3046 234035bc 2019-06-01 stsp goto done;
3047 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3049 234035bc 2019-06-01 stsp goto done;
3050 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3051 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3052 3969253a 2020-03-07 stsp if (err) {
3053 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3054 3969253a 2020-03-07 stsp goto done;
3056 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3057 2b92fad7 2019-06-02 stsp if (err) {
3058 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3059 2b92fad7 2019-06-02 stsp goto done;
3061 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3062 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3063 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3068 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3069 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3070 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3071 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3072 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3073 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3074 1af628f4 2021-06-03 stsp free(id_str);
3075 54d5be07 2021-06-03 stsp free(label_deriv2);
3076 234035bc 2019-06-01 stsp free(ondisk_path);
3077 234035bc 2019-06-01 stsp return err;
3080 69de9dd4 2021-09-03 stsp static const struct got_error *
3081 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3083 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3085 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3086 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3087 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3088 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3089 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3091 69de9dd4 2021-09-03 stsp return NULL;
3094 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3095 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3096 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3097 234035bc 2019-06-01 stsp struct got_repository *repo;
3100 234035bc 2019-06-01 stsp static const struct got_error *
3101 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3102 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
3103 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
3104 b72706c3 2022-06-01 stsp const char *path1, const char *path2,
3105 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3107 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3108 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3109 234035bc 2019-06-01 stsp unsigned char status;
3110 234035bc 2019-06-01 stsp struct stat sb;
3111 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3112 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3113 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3114 234035bc 2019-06-01 stsp char *ondisk_path;
3116 69de9dd4 2021-09-03 stsp if (id == NULL)
3117 69de9dd4 2021-09-03 stsp return NULL;
3119 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3120 69de9dd4 2021-09-03 stsp if (ie == NULL)
3121 69de9dd4 2021-09-03 stsp return NULL;
3123 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3125 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3127 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3128 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3129 5546d466 2021-09-02 stsp free(ondisk_path);
3131 234035bc 2019-06-01 stsp return err;
3132 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3133 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3135 234035bc 2019-06-01 stsp return NULL;
3138 818c7501 2019-07-11 stsp static const struct got_error *
3139 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3140 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3141 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3142 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3143 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3145 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3146 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3147 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3148 a44927cc 2022-04-07 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3149 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3150 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3151 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3152 b72706c3 2022-06-01 stsp FILE *f1 = NULL, *f2 = NULL;
3153 f9d37699 2022-06-28 stsp int fd1 = -1, fd2 = -1;
3155 03415a1a 2019-06-02 stsp if (commit_id1) {
3156 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit1, repo, commit_id1);
3158 a44927cc 2022-04-07 stsp goto done;
3159 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id1, repo, commit1,
3160 03415a1a 2019-06-02 stsp worktree->path_prefix);
3161 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3162 03415a1a 2019-06-02 stsp goto done;
3164 69d57f3d 2020-07-31 stsp if (tree_id1) {
3165 69d57f3d 2020-07-31 stsp char *id_str;
3167 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3169 03415a1a 2019-06-02 stsp goto done;
3171 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3173 f69721c3 2019-10-21 stsp goto done;
3175 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3176 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3177 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3178 f69721c3 2019-10-21 stsp free(id_str);
3179 f69721c3 2019-10-21 stsp goto done;
3181 f69721c3 2019-10-21 stsp free(id_str);
3183 b72706c3 2022-06-01 stsp f1 = got_opentemp();
3184 b72706c3 2022-06-01 stsp if (f1 == NULL) {
3185 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3186 b72706c3 2022-06-01 stsp goto done;
3190 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit2, repo, commit_id2);
3192 a44927cc 2022-04-07 stsp goto done;
3194 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id2, repo, commit2,
3195 234035bc 2019-06-01 stsp worktree->path_prefix);
3197 234035bc 2019-06-01 stsp goto done;
3199 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3201 234035bc 2019-06-01 stsp goto done;
3203 b72706c3 2022-06-01 stsp f2 = got_opentemp();
3204 b72706c3 2022-06-01 stsp if (f2 == NULL) {
3205 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3206 f9d37699 2022-06-28 stsp goto done;
3209 f9d37699 2022-06-28 stsp fd1 = got_opentempfd();
3210 f9d37699 2022-06-28 stsp if (fd1 == -1) {
3211 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3212 b72706c3 2022-06-01 stsp goto done;
3215 f9d37699 2022-06-28 stsp fd2 = got_opentempfd();
3216 f9d37699 2022-06-28 stsp if (fd2 == -1) {
3217 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
3218 f9d37699 2022-06-28 stsp goto done;
3221 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3222 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3223 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3224 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3225 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3227 69de9dd4 2021-09-03 stsp goto done;
3229 234035bc 2019-06-01 stsp arg.worktree = worktree;
3230 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3231 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3232 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3233 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3234 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3235 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3236 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3237 5267b9e4 2021-09-26 stsp arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3238 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3239 b72706c3 2022-06-01 stsp merge_file_cb, &arg, 1);
3240 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3241 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3242 af12c6b9 2019-06-04 stsp err = sync_err;
3244 a44927cc 2022-04-07 stsp if (commit1)
3245 a44927cc 2022-04-07 stsp got_object_commit_close(commit1);
3246 a44927cc 2022-04-07 stsp if (commit2)
3247 a44927cc 2022-04-07 stsp got_object_commit_close(commit2);
3248 234035bc 2019-06-01 stsp if (tree1)
3249 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3250 234035bc 2019-06-01 stsp if (tree2)
3251 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3252 b72706c3 2022-06-01 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3253 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3254 b72706c3 2022-06-01 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3255 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3256 f9d37699 2022-06-28 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3257 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3258 f9d37699 2022-06-28 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3259 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
3260 f69721c3 2019-10-21 stsp free(label_orig);
3261 818c7501 2019-07-11 stsp return err;
3264 818c7501 2019-07-11 stsp const struct got_error *
3265 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3266 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3267 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3268 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3270 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3271 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3272 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3274 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3276 818c7501 2019-07-11 stsp return err;
3278 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3280 818c7501 2019-07-11 stsp goto done;
3282 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3283 69de9dd4 2021-09-03 stsp worktree);
3285 818c7501 2019-07-11 stsp goto done;
3287 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3288 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3289 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3291 818c7501 2019-07-11 stsp if (fileindex)
3292 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3293 818c7501 2019-07-11 stsp free(fileindex_path);
3294 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3295 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3296 234035bc 2019-06-01 stsp err = unlockerr;
3297 234035bc 2019-06-01 stsp return err;
3300 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3301 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3302 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3303 927df6b7 2019-02-10 stsp const char *status_path;
3304 927df6b7 2019-02-10 stsp size_t status_path_len;
3305 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3306 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3307 f8d1f275 2019-02-04 stsp void *status_arg;
3308 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3309 f8d1f275 2019-02-04 stsp void *cancel_arg;
3310 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3311 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3312 f2a9dc41 2019-12-13 tracey int report_unchanged;
3313 3143d852 2020-06-25 stsp int no_ignores;
3316 f8d1f275 2019-02-04 stsp static const struct got_error *
3317 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3318 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3319 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3320 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3322 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3323 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3324 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3325 927df6b7 2019-02-10 stsp struct stat sb;
3326 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3327 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3328 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3330 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3332 98eaaa12 2019-08-03 stsp return err;
3334 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3335 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3336 98eaaa12 2019-08-03 stsp return NULL;
3338 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3339 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3340 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3342 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3343 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3344 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3346 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3347 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3348 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3349 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3350 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3353 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3354 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3357 927df6b7 2019-02-10 stsp static const struct got_error *
3358 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3359 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3361 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3362 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3363 f8d1f275 2019-02-04 stsp char *abspath;
3365 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3366 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3368 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3369 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3370 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3371 927df6b7 2019-02-10 stsp return NULL;
3373 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3374 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3375 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3376 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3378 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3379 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3380 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3383 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3384 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3385 f8d1f275 2019-02-04 stsp free(abspath);
3386 9d31a1d8 2018-03-11 stsp return err;
3389 f8d1f275 2019-02-04 stsp static const struct got_error *
3390 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3392 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3393 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3394 2ec1f75b 2019-03-26 stsp unsigned char status;
3396 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3397 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3399 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3400 927df6b7 2019-02-10 stsp return NULL;
3402 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3403 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3404 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3405 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3407 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3408 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3409 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3413 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3415 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3417 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3418 6841da00 2019-08-08 stsp free((char *)pe->path);
3419 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3423 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3425 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3427 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3428 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3429 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3430 6841da00 2019-08-08 stsp free((char *)pe->path);
3432 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3435 6841da00 2019-08-08 stsp static const struct got_error *
3436 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3438 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3439 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3440 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3441 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3442 6841da00 2019-08-08 stsp size_t linesize = 0;
3443 6841da00 2019-08-08 stsp ssize_t linelen;
3445 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3446 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3447 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3448 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3450 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3451 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3452 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3454 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3455 bd8de430 2019-10-04 stsp if (line[0] == '#')
3458 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3459 bd8de430 2019-10-04 stsp if (line[0] == '!')
3462 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3463 6841da00 2019-08-08 stsp line) == -1) {
3464 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3465 6841da00 2019-08-08 stsp goto done;
3467 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3469 6841da00 2019-08-08 stsp goto done;
3471 6841da00 2019-08-08 stsp if (ferror(f)) {
3472 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3473 6841da00 2019-08-08 stsp goto done;
3476 6841da00 2019-08-08 stsp dirpath = strdup(path);
3477 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3478 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3479 6841da00 2019-08-08 stsp goto done;
3481 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3483 6841da00 2019-08-08 stsp free(line);
3484 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3485 6841da00 2019-08-08 stsp free(dirpath);
3486 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3488 6841da00 2019-08-08 stsp return err;
3492 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3494 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3496 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3497 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3498 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3499 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3501 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3502 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3504 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3506 bd8de430 2019-10-04 stsp pattern += 3;
3508 bd8de430 2019-10-04 stsp while (*p) {
3509 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3510 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3511 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3512 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3514 bd8de430 2019-10-04 stsp while (*p == '/')
3524 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3525 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3526 6841da00 2019-08-08 stsp * ignores backwards.
3528 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3529 6841da00 2019-08-08 stsp while (pe) {
3530 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3531 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3532 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3533 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3534 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3535 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3536 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3537 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3538 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3543 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3549 6841da00 2019-08-08 stsp static const struct got_error *
3550 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3551 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3553 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3554 6841da00 2019-08-08 stsp char *ignorespath;
3555 886cec17 2019-12-15 stsp int fd = -1;
3556 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3558 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3559 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3560 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3562 886cec17 2019-12-15 stsp if (dirfd != -1) {
3563 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, ignores_filename,
3564 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3565 886cec17 2019-12-15 stsp if (fd == -1) {
3566 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3567 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3568 886cec17 2019-12-15 stsp ignorespath);
3570 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3571 5e91dae4 2022-08-30 stsp if (ignoresfile == NULL)
3572 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3573 886cec17 2019-12-15 stsp ignorespath);
3576 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3580 00fe21f2 2021-12-31 stsp ignoresfile = fopen(ignorespath, "re");
3581 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3582 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3583 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3584 886cec17 2019-12-15 stsp ignorespath);
3586 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3589 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3590 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3591 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3592 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3593 6841da00 2019-08-08 stsp free(ignorespath);
3594 6841da00 2019-08-08 stsp return err;
3597 f8d1f275 2019-02-04 stsp static const struct got_error *
3598 62da3196 2021-10-01 stsp status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3599 62da3196 2021-10-01 stsp int dirfd)
3601 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3602 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3603 f8d1f275 2019-02-04 stsp char *path = NULL;
3605 62da3196 2021-10-01 stsp if (ignore != NULL)
3606 62da3196 2021-10-01 stsp *ignore = 0;
3608 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3609 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3611 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3612 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3613 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3615 f8d1f275 2019-02-04 stsp path = de->d_name;
3618 62da3196 2021-10-01 stsp if (de->d_type == DT_DIR) {
3619 62da3196 2021-10-01 stsp if (!a->no_ignores && ignore != NULL &&
3620 62da3196 2021-10-01 stsp match_ignores(a->ignores, path))
3621 62da3196 2021-10-01 stsp *ignore = 1;
3622 62da3196 2021-10-01 stsp } else if (!match_ignores(a->ignores, path) &&
3623 62da3196 2021-10-01 stsp got_path_is_child(path, a->status_path, a->status_path_len))
3624 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3625 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3626 f8d1f275 2019-02-04 stsp if (parent_path[0])
3627 f8d1f275 2019-02-04 stsp free(path);
3628 b72f483a 2019-02-05 stsp return err;
3631 347d1d3e 2019-07-12 stsp static const struct got_error *
3632 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3634 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3635 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3637 3143d852 2020-06-25 stsp if (a->no_ignores)
3638 3143d852 2020-06-25 stsp return NULL;
3640 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3641 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3643 3143d852 2020-06-25 stsp return err;
3645 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3646 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3648 3143d852 2020-06-25 stsp return err;
3651 3143d852 2020-06-25 stsp static const struct got_error *
3652 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3653 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3654 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3655 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3657 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3658 abb4604f 2019-07-27 stsp struct stat sb;
3660 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3662 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3663 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3665 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3666 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3667 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3668 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3669 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3672 916237f3 2022-02-11 stsp if (!no_ignores && match_ignores(ignores, path))
3673 916237f3 2022-02-11 stsp return NULL;
3675 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3676 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3677 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3679 abb4604f 2019-07-27 stsp return NULL;
3682 3143d852 2020-06-25 stsp static const struct got_error *
3683 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3684 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3686 3143d852 2020-06-25 stsp const struct got_error *err;
3687 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3689 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3690 3143d852 2020-06-25 stsp ".cvsignore");
3692 3143d852 2020-06-25 stsp return err;
3694 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3695 3143d852 2020-06-25 stsp ".gitignore");
3697 3143d852 2020-06-25 stsp return err;
3699 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3700 3143d852 2020-06-25 stsp if (err) {
3701 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3702 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3703 3143d852 2020-06-25 stsp return err;
3705 3143d852 2020-06-25 stsp for (;;) {
3706 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3707 3143d852 2020-06-25 stsp ".cvsignore");
3710 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3711 3143d852 2020-06-25 stsp ".gitignore");
3714 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3715 3143d852 2020-06-25 stsp if (err) {
3716 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3717 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3720 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3722 b737c85a 2020-06-26 stsp free(parent_path);
3723 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3724 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3727 b737c85a 2020-06-26 stsp free(parent_path);
3728 b737c85a 2020-06-26 stsp free(next_parent_path);
3729 3143d852 2020-06-25 stsp return err;
3732 abb4604f 2019-07-27 stsp static const struct got_error *
3733 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3734 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3735 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3736 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3737 f2a9dc41 2019-12-13 tracey int report_unchanged)
3739 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3740 6fc93f37 2019-12-13 stsp int fd = -1;
3741 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3742 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3743 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3744 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3745 a84c0d30 2022-03-12 stsp struct got_fileindex_entry *ie;
3747 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3749 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3750 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3751 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3753 a84c0d30 2022-03-12 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3755 a84c0d30 2022-03-12 stsp err = report_single_file_status(path, ondisk_path,
3756 a84c0d30 2022-03-12 stsp fileindex, status_cb, status_arg, repo,
3757 a84c0d30 2022-03-12 stsp report_unchanged, &ignores, no_ignores);
3758 a84c0d30 2022-03-12 stsp goto done;
3761 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3762 6fc93f37 2019-12-13 stsp if (fd == -1) {
3763 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3764 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
3765 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3767 ff56836b 2021-07-08 stsp if (!no_ignores) {
3768 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3769 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3771 ff56836b 2021-07-08 stsp goto done;
3773 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3774 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3775 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3778 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3779 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3780 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3781 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3782 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3783 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3784 abb4604f 2019-07-27 stsp arg.status_path = path;
3785 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3786 abb4604f 2019-07-27 stsp arg.repo = repo;
3787 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3788 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3789 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3790 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3791 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3792 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3793 022fae89 2019-12-06 tracey if (!no_ignores) {
3794 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3795 3143d852 2020-06-25 stsp worktree->root_path, path);
3797 3143d852 2020-06-25 stsp goto done;
3799 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3800 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3801 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3804 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3805 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3806 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3807 927df6b7 2019-02-10 stsp free(ondisk_path);
3808 347d1d3e 2019-07-12 stsp return err;
3811 347d1d3e 2019-07-12 stsp const struct got_error *
3812 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3813 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3814 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3815 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3817 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3818 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3819 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3820 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3822 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3824 347d1d3e 2019-07-12 stsp return err;
3826 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3827 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3828 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3829 f6343036 2021-06-22 stsp no_ignores, 0);
3833 f8d1f275 2019-02-04 stsp free(fileindex_path);
3834 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3835 f8d1f275 2019-02-04 stsp return err;
3838 6c7ab921 2019-03-18 stsp const struct got_error *
3839 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3840 6c7ab921 2019-03-18 stsp const char *arg)
3842 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3843 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3844 6c7ab921 2019-03-18 stsp size_t len;
3845 00bb5ea0 2020-07-23 stsp struct stat sb;
3846 01740607 2020-11-04 stsp char *abspath = NULL;
3847 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3849 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3851 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3852 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3853 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3855 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3856 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3857 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3858 00bb5ea0 2020-07-23 stsp goto done;
3860 727173c3 2020-11-06 stsp sb.st_mode = 0;
3862 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3864 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3865 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3866 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3867 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3869 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3870 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3871 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3872 00bb5ea0 2020-07-23 stsp goto done;
3876 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3877 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3879 d0710d08 2019-07-22 stsp goto done;
3880 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3881 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3882 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3883 00bb5ea0 2020-07-23 stsp goto done;
3886 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3887 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3888 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3889 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3890 00bb5ea0 2020-07-23 stsp goto done;
3892 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3893 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3894 01740607 2020-11-04 stsp goto done;
3896 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3897 01740607 2020-11-04 stsp sizeof(canonpath));
3899 00bb5ea0 2020-07-23 stsp goto done;
3900 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3901 01740607 2020-11-04 stsp if (resolved == NULL) {
3902 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3903 01740607 2020-11-04 stsp goto done;
3908 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3909 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3910 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3911 6c7ab921 2019-03-18 stsp goto done;
3914 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3915 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3916 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3918 f6d88e1a 2019-05-29 stsp goto done;
3920 f6d88e1a 2019-05-29 stsp path = strdup("");
3921 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3922 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3923 f6d88e1a 2019-05-29 stsp goto done;
3927 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3928 6c7ab921 2019-03-18 stsp len = strlen(path);
3929 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3930 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3934 01740607 2020-11-04 stsp free(abspath);
3935 6c7ab921 2019-03-18 stsp free(resolved);
3936 d0710d08 2019-07-22 stsp free(cwd);
3937 6c7ab921 2019-03-18 stsp if (err == NULL)
3938 6c7ab921 2019-03-18 stsp *wt_path = path;
3940 6c7ab921 2019-03-18 stsp free(path);
3941 d00136be 2019-03-26 stsp return err;
3944 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3945 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3946 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3947 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3948 4e68cba3 2019-11-23 stsp void *progress_arg;
3949 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3952 4e68cba3 2019-11-23 stsp static const struct got_error *
3953 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3954 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3955 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3956 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3958 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3959 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3960 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3961 6d022e97 2019-08-04 stsp struct stat sb;
3962 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3964 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3965 dbb83fbd 2019-12-12 stsp relpath) == -1)
3966 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3968 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3970 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3971 12463d8b 2019-12-13 stsp de_name, a->repo);
3973 dbb83fbd 2019-12-12 stsp goto done;
3974 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3975 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3976 dbb83fbd 2019-12-12 stsp goto done;
3977 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3979 dbb83fbd 2019-12-12 stsp goto done;
3982 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3983 9b4603c0 2022-01-31 stsp if (status == GOT_STATUS_NONEXISTENT)
3984 9b4603c0 2022-01-31 stsp err = got_error_set_errno(ENOENT, ondisk_path);
3986 9b4603c0 2022-01-31 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3987 dbb83fbd 2019-12-12 stsp goto done;
3990 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3992 4e68cba3 2019-11-23 stsp goto done;
3993 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3994 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3995 3969253a 2020-03-07 stsp if (err) {
3996 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3997 3969253a 2020-03-07 stsp goto done;
3999 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
4000 07f5b47a 2019-06-02 stsp if (err) {
4001 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
4002 4e68cba3 2019-11-23 stsp goto done;
4005 dbb83fbd 2019-12-12 stsp free(ondisk_path);
4007 dbb83fbd 2019-12-12 stsp return err;
4008 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
4009 dbb83fbd 2019-12-12 stsp return NULL;
4010 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4013 d00136be 2019-03-26 stsp const struct got_error *
4014 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4015 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4016 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4017 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4019 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4020 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4021 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4022 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4023 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4025 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4027 d00136be 2019-03-26 stsp return err;
4029 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4031 d00136be 2019-03-26 stsp goto done;
4033 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4034 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4035 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4036 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4037 4e68cba3 2019-11-23 stsp saa.repo = repo;
4039 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4040 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4041 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4045 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4046 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4047 af12c6b9 2019-06-04 stsp err = sync_err;
4049 fb399478 2019-07-12 stsp free(fileindex_path);
4050 d00136be 2019-03-26 stsp if (fileindex)
4051 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4052 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4053 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4054 d00136be 2019-03-26 stsp err = unlockerr;
4055 6c7ab921 2019-03-18 stsp return err;
4058 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4059 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4060 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4061 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4062 f2a9dc41 2019-12-13 tracey void *progress_arg;
4063 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4064 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4065 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4066 4e12cd97 2022-01-25 stsp int ignore_missing_paths;
4067 766841c2 2020-08-13 stsp const char *status_codes;
4070 f2a9dc41 2019-12-13 tracey static const struct got_error *
4071 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4072 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4073 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4074 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4076 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4077 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4078 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4079 17ed4618 2019-06-02 stsp struct stat sb;
4080 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4082 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_NONEXISTENT) {
4083 4e12cd97 2022-01-25 stsp if (a->ignore_missing_paths)
4084 4e12cd97 2022-01-25 stsp return NULL;
4085 4e12cd97 2022-01-25 stsp return got_error_set_errno(ENOENT, relpath);
4088 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4089 17ed4618 2019-06-02 stsp if (ie == NULL)
4090 692bdcc4 2022-01-25 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4092 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4093 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4094 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4095 9acbc4fa 2019-08-03 stsp return NULL;
4096 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4099 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4100 f2a9dc41 2019-12-13 tracey relpath) == -1)
4101 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4103 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4106 f2a9dc41 2019-12-13 tracey goto done;
4108 766841c2 2020-08-13 stsp if (a->status_codes) {
4109 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4111 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4112 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4115 5e91dae4 2022-08-30 stsp if (i == ncodes) {
4116 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4117 766841c2 2020-08-13 stsp free(ondisk_path);
4118 766841c2 2020-08-13 stsp return NULL;
4120 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4121 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4122 766841c2 2020-08-13 stsp static char msg[64];
4123 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4124 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4125 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4126 766841c2 2020-08-13 stsp goto done;
4130 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4131 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4132 f2a9dc41 2019-12-13 tracey goto done;
4133 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4134 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4135 f2a9dc41 2019-12-13 tracey goto done;
4137 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4138 4e12cd97 2022-01-25 stsp err = got_error_set_errno(ENOENT, relpath);
4139 4e12cd97 2022-01-25 stsp goto done;
4141 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4142 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4143 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4144 f2a9dc41 2019-12-13 tracey goto done;
4148 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4149 20a2ad1c 2020-10-20 stsp size_t root_len;
4151 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4152 a06ca3f7 2022-10-15 stsp if (unlinkat(dirfd, de_name, 0) == -1) {
4153 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4154 12463d8b 2019-12-13 stsp ondisk_path);
4155 12463d8b 2019-12-13 stsp goto done;
4157 a06ca3f7 2022-10-15 stsp } else if (unlink(ondisk_path) == -1) {
4158 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4159 12463d8b 2019-12-13 stsp goto done;
4162 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4164 20a2ad1c 2020-10-20 stsp char *parent;
4165 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4167 2513f20a 2020-10-20 stsp goto done;
4168 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4169 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4170 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4171 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4172 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4173 20a2ad1c 2020-10-20 stsp ondisk_path);
4176 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4177 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4180 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4182 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4183 f2a9dc41 2019-12-13 tracey if (err)
4184 f2a9dc41 2019-12-13 tracey return err;
4185 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4186 f2a9dc41 2019-12-13 tracey return NULL;
4187 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4188 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4191 2ec1f75b 2019-03-26 stsp const struct got_error *
4192 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4193 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4194 766841c2 2020-08-13 stsp const char *status_codes,
4195 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4196 4e12cd97 2022-01-25 stsp struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4198 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4199 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4200 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4201 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4202 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4204 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4206 2ec1f75b 2019-03-26 stsp return err;
4208 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4210 2ec1f75b 2019-03-26 stsp goto done;
4212 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4213 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4214 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4215 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4216 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4217 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4218 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4219 4e12cd97 2022-01-25 stsp sda.ignore_missing_paths = ignore_missing_paths;
4220 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4222 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4223 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4224 62da3196 2021-10-01 stsp schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4228 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4229 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4230 af12c6b9 2019-06-04 stsp err = sync_err;
4232 fb399478 2019-07-12 stsp free(fileindex_path);
4233 2ec1f75b 2019-03-26 stsp if (fileindex)
4234 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4235 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4236 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4237 2ec1f75b 2019-03-26 stsp err = unlockerr;
4238 33aa809d 2019-08-08 stsp return err;
4241 33aa809d 2019-08-08 stsp static const struct got_error *
4242 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4244 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4245 33aa809d 2019-08-08 stsp char *line = NULL;
4246 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4247 33aa809d 2019-08-08 stsp ssize_t linelen;
4249 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4250 33aa809d 2019-08-08 stsp if (linelen == -1) {
4251 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4252 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4253 33aa809d 2019-08-08 stsp goto done;
4255 33aa809d 2019-08-08 stsp return NULL;
4257 33aa809d 2019-08-08 stsp if (outfile) {
4258 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4259 33aa809d 2019-08-08 stsp if (n != linelen) {
4260 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4261 33aa809d 2019-08-08 stsp goto done;
4264 33aa809d 2019-08-08 stsp if (rejectfile) {
4265 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4266 33aa809d 2019-08-08 stsp if (n != linelen)
4267 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4270 33aa809d 2019-08-08 stsp free(line);
4271 2ec1f75b 2019-03-26 stsp return err;
4274 33aa809d 2019-08-08 stsp static const struct got_error *
4275 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4277 33aa809d 2019-08-08 stsp char *line = NULL;
4278 33aa809d 2019-08-08 stsp size_t linesize = 0;
4279 33aa809d 2019-08-08 stsp ssize_t linelen;
4281 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4282 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4283 500467ff 2019-09-25 hiltjo if (ferror(f))
4284 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4285 500467ff 2019-09-25 hiltjo return NULL;
4287 33aa809d 2019-08-08 stsp free(line);
4288 33aa809d 2019-08-08 stsp return NULL;
4291 33aa809d 2019-08-08 stsp static const struct got_error *
4292 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4293 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4294 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4296 33aa809d 2019-08-08 stsp const struct got_error *err;
4298 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4299 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4300 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4302 33aa809d 2019-08-08 stsp return err;
4303 33aa809d 2019-08-08 stsp (*line_cur1)++;
4305 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4306 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4307 33aa809d 2019-08-08 stsp if (rejectfile)
4308 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4310 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4312 33aa809d 2019-08-08 stsp return err;
4313 33aa809d 2019-08-08 stsp (*line_cur2)++;
4315 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4316 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4317 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4319 33aa809d 2019-08-08 stsp return err;
4320 33aa809d 2019-08-08 stsp (*line_cur2)++;
4322 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4323 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4324 33aa809d 2019-08-08 stsp if (rejectfile)
4325 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4327 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4329 33aa809d 2019-08-08 stsp return err;
4330 33aa809d 2019-08-08 stsp (*line_cur1)++;
4333 f1e81a05 2019-08-10 stsp return NULL;
4336 f1e81a05 2019-08-10 stsp static const struct got_error *
4337 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4338 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4340 f1e81a05 2019-08-10 stsp const struct got_error *err;
4342 f1e81a05 2019-08-10 stsp if (outfile) {
4343 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4344 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4345 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4347 f1e81a05 2019-08-10 stsp return err;
4348 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4351 f1e81a05 2019-08-10 stsp if (rejectfile) {
4352 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4353 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4354 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4356 f1e81a05 2019-08-10 stsp return err;
4357 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4361 33aa809d 2019-08-08 stsp return NULL;
4364 33aa809d 2019-08-08 stsp static const struct got_error *
4365 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4366 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4367 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4368 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4369 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4371 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4372 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4373 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4374 33aa809d 2019-08-08 stsp FILE *hunkfile;
4375 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4376 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4379 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4381 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4382 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4383 fe621944 2020-11-10 stsp start_old = cc.left.start;
4384 fe621944 2020-11-10 stsp end_old = cc.left.end;
4385 fe621944 2020-11-10 stsp start_new = cc.right.start;
4386 fe621944 2020-11-10 stsp end_new = cc.right.end;
4388 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4389 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4390 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4392 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4393 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4394 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4396 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4397 fe621944 2020-11-10 stsp if (diff_state == NULL)
4398 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4399 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4401 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4402 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4403 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4404 33aa809d 2019-08-08 stsp goto done;
4407 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4408 fe621944 2020-11-10 stsp diff_result, &cc);
4409 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4410 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4411 33aa809d 2019-08-08 stsp goto done;
4414 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4415 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4416 33aa809d 2019-08-08 stsp goto done;
4419 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4420 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4422 33aa809d 2019-08-08 stsp goto done;
4424 33aa809d 2019-08-08 stsp switch (*choice) {
4425 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4426 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4427 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4429 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4430 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4431 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4433 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4436 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4440 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4441 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4442 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4443 33aa809d 2019-08-08 stsp return err;
4446 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4447 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4448 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4449 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4450 1f1abb7e 2019-08-08 stsp void *progress_arg;
4451 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4452 33aa809d 2019-08-08 stsp void *patch_arg;
4453 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4454 f259c4c1 2021-09-24 stsp int unlink_added_files;
4457 e20a8b6f 2019-06-04 stsp static const struct got_error *
4458 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4459 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4460 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4461 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4462 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4464 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4465 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4466 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4467 eb81bc23 2022-06-28 tracey int fd = -1, fd2 = -1;
4468 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4469 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4470 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4471 fe621944 2020-11-10 stsp struct stat sb2;
4472 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4473 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4474 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4476 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4478 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4480 33aa809d 2019-08-08 stsp return err;
4482 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4483 e7ae0baf 2021-12-31 stsp fd2 = openat(dirfd2, de_name2,
4484 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4485 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4486 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4487 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4488 fa3cef63 2020-07-23 stsp goto done;
4490 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4491 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4492 c0df5966 2021-12-31 stsp if (link_len == -1) {
4493 c0df5966 2021-12-31 stsp return got_error_from_errno2("readlinkat",
4496 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4497 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4500 8bd0cdad 2021-12-31 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4501 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4502 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4503 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4504 fa3cef63 2020-07-23 stsp goto done;
4506 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4507 fa3cef63 2020-07-23 stsp sizeof(link_target));
4508 fa3cef63 2020-07-23 stsp if (link_len == -1)
4509 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4510 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4511 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4514 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4515 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4516 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4517 fa3cef63 2020-07-23 stsp goto done;
4520 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4521 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4522 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4523 fa3cef63 2020-07-23 stsp goto done;
4528 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4529 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4530 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4531 fa3cef63 2020-07-23 stsp goto done;
4533 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4534 fa3cef63 2020-07-23 stsp if (n != link_len) {
4535 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4536 fa3cef63 2020-07-23 stsp goto done;
4538 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4539 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4540 fa3cef63 2020-07-23 stsp goto done;
4542 fa3cef63 2020-07-23 stsp rewind(f2);
4545 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4546 eb81bc23 2022-06-28 tracey if (fd == -1) {
4547 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4548 eb81bc23 2022-06-28 tracey goto done;
4551 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4553 33aa809d 2019-08-08 stsp goto done;
4555 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4557 33aa809d 2019-08-08 stsp goto done;
4559 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4561 33aa809d 2019-08-08 stsp goto done;
4563 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4564 4b752015 2022-06-30 stsp 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4566 33aa809d 2019-08-08 stsp goto done;
4568 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4570 33aa809d 2019-08-08 stsp goto done;
4572 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4573 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4574 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4575 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4577 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4578 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4579 5e91dae4 2022-08-30 stsp struct diff_chunk_context cc = {};
4580 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4581 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4582 fe621944 2020-11-10 stsp nchanges++;
4584 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4585 33aa809d 2019-08-08 stsp int choice;
4586 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4587 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4588 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4589 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4590 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4591 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4593 33aa809d 2019-08-08 stsp goto done;
4594 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4595 33aa809d 2019-08-08 stsp have_content = 1;
4596 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4599 1ebedb77 2019-10-19 stsp if (have_content) {
4600 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4601 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4602 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4604 1ebedb77 2019-10-19 stsp goto done;
4606 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4607 b2b3fce1 2022-10-29 op mode_t mode;
4609 b2b3fce1 2022-10-29 op mode = apply_umask(sb2.st_mode);
4610 b2b3fce1 2022-10-29 op if (fchmod(fileno(outfile), mode) == -1) {
4611 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4612 fa3cef63 2020-07-23 stsp goto done;
4617 33aa809d 2019-08-08 stsp free(id_str);
4618 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4619 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4621 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4622 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4623 fe621944 2020-11-10 stsp if (err == NULL)
4624 fe621944 2020-11-10 stsp err = free_err;
4625 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4626 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4627 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4628 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4629 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4630 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4631 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4632 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4633 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4634 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4635 33aa809d 2019-08-08 stsp if (err || !have_content) {
4636 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4637 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4638 33aa809d 2019-08-08 stsp free(*path_outfile);
4639 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4641 33aa809d 2019-08-08 stsp free(path1);
4642 33aa809d 2019-08-08 stsp return err;
4645 33aa809d 2019-08-08 stsp static const struct got_error *
4646 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4647 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4648 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4649 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4651 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4652 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4653 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4654 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4655 a44927cc 2022-04-07 stsp struct got_commit_object *base_commit = NULL;
4656 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4657 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4658 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4659 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4660 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4661 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4662 eb81bc23 2022-06-28 tracey int fd = -1;
4664 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4665 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4666 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4667 d3bcc3d1 2019-08-08 stsp return NULL;
4669 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4670 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4671 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4673 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4674 65084dad 2019-08-08 stsp if (ie == NULL)
4675 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4677 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4678 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4679 a129376b 2019-03-28 stsp if (err) {
4680 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4681 a129376b 2019-03-28 stsp goto done;
4682 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4683 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4684 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4685 e20a8b6f 2019-06-04 stsp goto done;
4688 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4689 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4690 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4691 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4692 a129376b 2019-03-28 stsp goto done;
4695 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4696 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4697 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4698 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4699 a129376b 2019-03-28 stsp goto done;
4702 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4703 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4704 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4705 a129376b 2019-03-28 stsp goto done;
4710 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&base_commit, a->repo,
4711 a44927cc 2022-04-07 stsp a->worktree->base_commit_id);
4713 a44927cc 2022-04-07 stsp goto done;
4715 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4716 a9fa2909 2019-07-27 stsp if (err) {
4717 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4718 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4719 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4720 a9fa2909 2019-07-27 stsp goto done;
4722 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4724 a9fa2909 2019-07-27 stsp goto done;
4726 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4728 a9fa2909 2019-07-27 stsp goto done;
4730 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4731 1233e6b6 2020-10-19 stsp free(te_name);
4732 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4733 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4734 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4735 a9fa2909 2019-07-27 stsp goto done;
4739 a129376b 2019-03-28 stsp switch (status) {
4740 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4741 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4742 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4743 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4744 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4746 33aa809d 2019-08-08 stsp goto done;
4747 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4750 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4751 1f1abb7e 2019-08-08 stsp ie->path);
4753 1ee397ad 2019-07-12 stsp goto done;
4754 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4755 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4756 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4757 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4758 f259c4c1 2021-09-24 stsp relpath) == -1) {
4759 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4760 f259c4c1 2021-09-24 stsp goto done;
4762 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4763 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4764 f259c4c1 2021-09-24 stsp ondisk_path);
4769 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4770 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4771 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4772 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4773 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4775 33aa809d 2019-08-08 stsp goto done;
4776 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4779 33aa809d 2019-08-08 stsp /* fall through */
4780 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4781 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4782 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4783 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4784 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4785 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4786 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4787 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4788 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4790 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4791 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4792 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
4793 eb81bc23 2022-06-28 tracey if (fd == -1) {
4794 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
4795 eb81bc23 2022-06-28 tracey goto done;
4798 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4800 65084dad 2019-08-08 stsp goto done;
4802 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4803 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4804 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4805 a129376b 2019-03-28 stsp goto done;
4808 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4809 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4810 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4811 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4812 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4813 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4814 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4816 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4817 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4818 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4819 369fd7e5 2020-07-23 stsp path_content);
4822 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4823 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4824 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4825 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4827 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4828 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4829 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4830 369fd7e5 2020-07-23 stsp goto done;
4834 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4835 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4836 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4837 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4838 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4839 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4841 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4843 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4844 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4845 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4846 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4849 a129376b 2019-03-28 stsp goto done;
4850 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4851 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4852 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4853 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4854 437adc9d 2020-12-10 yzhong blob->id.sha1,
4855 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4857 2e1fa222 2020-07-23 stsp goto done;
4859 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4860 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4861 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4870 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4871 33aa809d 2019-08-08 stsp free(path_content);
4872 e20a8b6f 2019-06-04 stsp free(parent_path);
4873 a129376b 2019-03-28 stsp free(tree_path);
4874 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
4875 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
4877 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4879 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4880 a129376b 2019-03-28 stsp free(tree_id);
4881 a44927cc 2022-04-07 stsp if (base_commit)
4882 a44927cc 2022-04-07 stsp got_object_commit_close(base_commit);
4883 e20a8b6f 2019-06-04 stsp return err;
4886 e20a8b6f 2019-06-04 stsp const struct got_error *
4887 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4888 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4889 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4890 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4891 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4893 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4894 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4895 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4896 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4897 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4898 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4900 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4902 e20a8b6f 2019-06-04 stsp return err;
4904 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4906 e20a8b6f 2019-06-04 stsp goto done;
4908 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4909 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4910 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4911 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4912 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4913 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4914 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4915 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4916 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4917 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4918 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
4922 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4923 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4924 e20a8b6f 2019-06-04 stsp err = sync_err;
4926 fb399478 2019-07-12 stsp free(fileindex_path);
4927 a129376b 2019-03-28 stsp if (fileindex)
4928 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4929 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4930 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4931 a129376b 2019-03-28 stsp err = unlockerr;
4932 c4296144 2019-05-09 stsp return err;
4935 cf066bf8 2019-05-09 stsp static void
4936 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4938 24519714 2019-05-09 stsp free(ct->path);
4939 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4940 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4941 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4942 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4943 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4944 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4948 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4949 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4950 24519714 2019-05-09 stsp struct got_repository *repo;
4951 24519714 2019-05-09 stsp struct got_worktree *worktree;
4952 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4953 5f8a88c6 2019-08-03 stsp int have_staged_files;
4954 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4955 2a47b1e5 2022-11-01 stsp int diff_header_shown;
4956 2a47b1e5 2022-11-01 stsp FILE *diff_outfile;
4962 2a47b1e5 2022-11-01 stsp * Create a file which contains the target path of a symlink so we can feed
4963 2a47b1e5 2022-11-01 stsp * it as content to the diff engine.
4965 2a47b1e5 2022-11-01 stsp static const struct got_error *
4966 2a47b1e5 2022-11-01 stsp get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4967 2a47b1e5 2022-11-01 stsp const char *abspath)
4969 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
4970 2a47b1e5 2022-11-01 stsp char target_path[PATH_MAX];
4971 2a47b1e5 2022-11-01 stsp ssize_t target_len, outlen;
4975 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
4976 2a47b1e5 2022-11-01 stsp target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4977 2a47b1e5 2022-11-01 stsp if (target_len == -1)
4978 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlinkat", abspath);
4980 2a47b1e5 2022-11-01 stsp target_len = readlink(abspath, target_path, PATH_MAX);
4981 2a47b1e5 2022-11-01 stsp if (target_len == -1)
4982 2a47b1e5 2022-11-01 stsp return got_error_from_errno2("readlink", abspath);
4985 2a47b1e5 2022-11-01 stsp *fd = got_opentempfd();
4986 2a47b1e5 2022-11-01 stsp if (*fd == -1)
4987 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentempfd");
4989 2a47b1e5 2022-11-01 stsp outlen = write(*fd, target_path, target_len);
4990 2a47b1e5 2022-11-01 stsp if (outlen == -1) {
4991 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
4992 2a47b1e5 2022-11-01 stsp goto done;
4995 2a47b1e5 2022-11-01 stsp if (lseek(*fd, 0, SEEK_SET) == -1) {
4996 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("lseek", abspath);
4997 2a47b1e5 2022-11-01 stsp goto done;
5000 2a47b1e5 2022-11-01 stsp if (err) {
5001 2a47b1e5 2022-11-01 stsp close(*fd);
5004 2a47b1e5 2022-11-01 stsp return err;
5007 2a47b1e5 2022-11-01 stsp static const struct got_error *
5008 2a47b1e5 2022-11-01 stsp append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5009 2a47b1e5 2022-11-01 stsp FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5010 2a47b1e5 2022-11-01 stsp struct got_repository *repo, struct got_worktree *worktree)
5012 2a47b1e5 2022-11-01 stsp const struct got_error *err = NULL;
5013 2a47b1e5 2022-11-01 stsp struct got_blob_object *blob1 = NULL;
5014 2a47b1e5 2022-11-01 stsp int fd = -1, fd1 = -1, fd2 = -1;
5015 2a47b1e5 2022-11-01 stsp FILE *ondisk_file = NULL;
5016 2a47b1e5 2022-11-01 stsp char *label1 = NULL;
5017 2a47b1e5 2022-11-01 stsp struct stat sb;
5018 2a47b1e5 2022-11-01 stsp off_t size1 = 0;
5019 2a47b1e5 2022-11-01 stsp int f2_exists = 0;
5020 2a47b1e5 2022-11-01 stsp int diff_staged = (ct->staged_status != GOT_STATUS_NO_CHANGE);
5021 2a47b1e5 2022-11-01 stsp char *id_str = NULL;
5023 2a47b1e5 2022-11-01 stsp memset(&sb, 0, sizeof(sb));
5025 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f1);
5027 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5028 2a47b1e5 2022-11-01 stsp err = got_opentemp_truncate(f2);
5030 2a47b1e5 2022-11-01 stsp return got_error_from_errno("got_opentemp_truncate");
5032 2a47b1e5 2022-11-01 stsp if (!*diff_header_shown) {
5033 2a47b1e5 2022-11-01 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
5035 2a47b1e5 2022-11-01 stsp return err;
5036 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5037 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree));
5038 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "commit - %s\n", id_str);
5039 2a47b1e5 2022-11-01 stsp fprintf(diff_outfile, "path + %s%s\n",
5040 2a47b1e5 2022-11-01 stsp got_worktree_get_root_path(worktree),
5041 2a47b1e5 2022-11-01 stsp diff_staged ? " (staged changes)" : "");
5042 2a47b1e5 2022-11-01 stsp *diff_header_shown = 1;
5045 2a47b1e5 2022-11-01 stsp if (diff_staged) {
5046 2a47b1e5 2022-11-01 stsp const char *label1 = NULL, *label2 = NULL;
5047 2a47b1e5 2022-11-01 stsp switch (ct->staged_status) {
5048 2a47b1e5 2022-11-01 stsp case GOT_STATUS_MODIFY:
5049 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5050 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5052 2a47b1e5 2022-11-01 stsp case GOT_STATUS_ADD:
5053 2a47b1e5 2022-11-01 stsp label2 = ct->path;
5055 2a47b1e5 2022-11-01 stsp case GOT_STATUS_DELETE:
5056 2a47b1e5 2022-11-01 stsp label1 = ct->path;
5059 2a47b1e5 2022-11-01 stsp return got_error(GOT_ERR_FILE_STATUS);
5061 2a47b1e5 2022-11-01 stsp fd1 = got_opentempfd();
5062 2a47b1e5 2022-11-01 stsp if (fd1 == -1) {
5063 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5064 2a47b1e5 2022-11-01 stsp goto done;
5066 2a47b1e5 2022-11-01 stsp fd2 = got_opentempfd();
5067 2a47b1e5 2022-11-01 stsp if (fd2 == -1) {
5068 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5069 2a47b1e5 2022-11-01 stsp goto done;
5071 2a47b1e5 2022-11-01 stsp err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5072 2a47b1e5 2022-11-01 stsp fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5073 2a47b1e5 2022-11-01 stsp label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5074 2a47b1e5 2022-11-01 stsp repo, diff_outfile);
5075 2a47b1e5 2022-11-01 stsp goto done;
5078 2a47b1e5 2022-11-01 stsp fd1 = got_opentempfd();
5079 2a47b1e5 2022-11-01 stsp if (fd1 == -1) {
5080 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentempfd");
5081 2a47b1e5 2022-11-01 stsp goto done;
5084 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_ADD) {
5085 2a47b1e5 2022-11-01 stsp err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5086 2a47b1e5 2022-11-01 stsp 8192, fd1);
5088 2a47b1e5 2022-11-01 stsp goto done;
5091 2a47b1e5 2022-11-01 stsp if (ct->status != GOT_STATUS_DELETE) {
5092 2a47b1e5 2022-11-01 stsp if (dirfd != -1) {
5093 2a47b1e5 2022-11-01 stsp fd = openat(dirfd, de_name,
5094 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5095 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5096 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5097 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("openat",
5098 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5099 2a47b1e5 2022-11-01 stsp goto done;
5101 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5102 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5104 2a47b1e5 2022-11-01 stsp goto done;
5107 2a47b1e5 2022-11-01 stsp fd = open(ct->ondisk_path,
5108 2a47b1e5 2022-11-01 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5109 2a47b1e5 2022-11-01 stsp if (fd == -1) {
5110 2a47b1e5 2022-11-01 stsp if (!got_err_open_nofollow_on_symlink()) {
5111 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("open",
5112 2a47b1e5 2022-11-01 stsp ct->ondisk_path);
5113 2a47b1e5 2022-11-01 stsp goto done;
5115 2a47b1e5 2022-11-01 stsp err = get_symlink_target_file(&fd, dirfd,
5116 2a47b1e5 2022-11-01 stsp de_name, ct->ondisk_path);
5118 2a47b1e5 2022-11-01 stsp goto done;
5121 2a47b1e5 2022-11-01 stsp if (fstatat(fd, ct->ondisk_path, &sb,
5122 2a47b1e5 2022-11-01 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5123 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fstatat", ct->ondisk_path);
5124 2a47b1e5 2022-11-01 stsp goto done;
5126 2a47b1e5 2022-11-01 stsp ondisk_file = fdopen(fd, "r");
5127 2a47b1e5 2022-11-01 stsp if (ondisk_file == NULL) {
5128 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("fdopen", ct->ondisk_path);
5129 2a47b1e5 2022-11-01 stsp goto done;
5132 2a47b1e5 2022-11-01 stsp f2_exists = 1;
5135 2a47b1e5 2022-11-01 stsp if (blob1) {
5136 2a47b1e5 2022-11-01 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5137 2a47b1e5 2022-11-01 stsp f1, blob1);
5139 2a47b1e5 2022-11-01 stsp goto done;
5142 2a47b1e5 2022-11-01 stsp err = got_diff_blob_file(blob1, f1, size1, label1,
5143 2a47b1e5 2022-11-01 stsp ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5144 2a47b1e5 2022-11-01 stsp GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, diff_outfile);
5146 2a47b1e5 2022-11-01 stsp if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5147 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5148 2a47b1e5 2022-11-01 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5149 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5150 2a47b1e5 2022-11-01 stsp if (blob1)
5151 2a47b1e5 2022-11-01 stsp got_object_blob_close(blob1);
5152 2a47b1e5 2022-11-01 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
5153 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("close");
5154 2a47b1e5 2022-11-01 stsp if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5155 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
5156 2a47b1e5 2022-11-01 stsp return err;
5159 c4296144 2019-05-09 stsp static const struct got_error *
5160 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
5161 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
5162 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5163 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
5165 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
5166 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
5167 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5168 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
5169 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
5170 768aea60 2019-05-09 stsp struct stat sb;
5172 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
5173 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
5174 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
5175 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5176 5f8a88c6 2019-08-03 stsp return NULL;
5178 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
5179 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
5181 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
5182 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
5183 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
5184 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
5185 5f8a88c6 2019-08-03 stsp return NULL;
5188 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
5189 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5190 036813ee 2019-05-09 stsp goto done;
5192 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
5193 036813ee 2019-05-09 stsp parent_path = strdup("");
5194 69960a46 2019-05-09 stsp if (parent_path == NULL)
5195 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
5197 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
5199 69960a46 2019-05-09 stsp return err;
5202 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
5203 cf066bf8 2019-05-09 stsp if (ct == NULL) {
5204 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
5205 c4296144 2019-05-09 stsp goto done;
5208 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5209 768aea60 2019-05-09 stsp relpath) == -1) {
5210 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5211 768aea60 2019-05-09 stsp goto done;
5214 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
5215 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
5216 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
5217 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5218 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
5219 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
5220 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
5221 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
5223 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
5224 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
5227 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5228 0aeb8099 2020-07-23 stsp goto done;
5230 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
5231 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
5232 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
5233 12463d8b 2019-12-13 stsp if (dirfd != -1) {
5234 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
5235 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5236 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
5237 12463d8b 2019-12-13 stsp ct->ondisk_path);
5238 12463d8b 2019-12-13 stsp goto done;
5240 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
5241 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
5242 768aea60 2019-05-09 stsp goto done;
5244 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5247 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5248 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5249 44d03001 2019-05-09 stsp relpath) == -1) {
5250 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5251 44d03001 2019-05-09 stsp goto done;
5254 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5255 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5256 35213c7c 2020-07-23 stsp int is_bad_symlink;
5257 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5258 35213c7c 2020-07-23 stsp ssize_t target_len;
5259 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5260 35213c7c 2020-07-23 stsp sizeof(target_path));
5261 35213c7c 2020-07-23 stsp if (target_len == -1) {
5262 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5263 35213c7c 2020-07-23 stsp ct->ondisk_path);
5264 35213c7c 2020-07-23 stsp goto done;
5266 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5267 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5269 35213c7c 2020-07-23 stsp goto done;
5270 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5271 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5272 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5273 35213c7c 2020-07-23 stsp goto done;
5278 cf066bf8 2019-05-09 stsp ct->status = status;
5279 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5280 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5281 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5282 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5283 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5284 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5285 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5286 b416585c 2019-05-13 stsp goto done;
5288 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5289 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5290 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5291 f0b75401 2019-08-03 stsp goto done;
5294 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5295 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5296 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5297 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5298 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5299 036813ee 2019-05-09 stsp goto done;
5302 24519714 2019-05-09 stsp ct->path = strdup(path);
5303 24519714 2019-05-09 stsp if (ct->path == NULL) {
5304 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5305 24519714 2019-05-09 stsp goto done;
5307 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5309 2a47b1e5 2022-11-01 stsp goto done;
5311 2a47b1e5 2022-11-01 stsp if (a->diff_outfile && ct && new != NULL) {
5312 2a47b1e5 2022-11-01 stsp err = append_ct_diff(ct, &a->diff_header_shown,
5313 2a47b1e5 2022-11-01 stsp a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5314 2a47b1e5 2022-11-01 stsp a->repo, a->worktree);
5316 2a47b1e5 2022-11-01 stsp goto done;
5319 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5320 ed175427 2019-05-09 stsp free_commitable(ct);
5321 24519714 2019-05-09 stsp free(parent_path);
5322 036813ee 2019-05-09 stsp free(path);
5323 a129376b 2019-03-28 stsp return err;
5326 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5327 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5328 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5329 036813ee 2019-05-09 stsp struct got_repository *);
5331 ed175427 2019-05-09 stsp static const struct got_error *
5332 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5333 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5334 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5335 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5336 afa376bf 2019-05-09 stsp struct got_repository *repo)
5338 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5339 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5340 036813ee 2019-05-09 stsp char *subpath;
5342 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5343 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5344 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5346 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5348 ed175427 2019-05-09 stsp return err;
5350 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5351 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5352 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5353 036813ee 2019-05-09 stsp free(subpath);
5354 036813ee 2019-05-09 stsp return err;
5357 036813ee 2019-05-09 stsp static const struct got_error *
5358 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5360 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5361 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5363 036813ee 2019-05-09 stsp *match = 0;
5365 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5366 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5367 0f63689d 2019-05-10 stsp return NULL;
5370 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5372 0f63689d 2019-05-10 stsp return err;
5373 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5374 036813ee 2019-05-09 stsp free(ct_parent_path);
5375 036813ee 2019-05-09 stsp return err;
5378 768aea60 2019-05-09 stsp static mode_t
5379 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5381 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5382 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5384 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5387 036813ee 2019-05-09 stsp static const struct got_error *
5388 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5389 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5391 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5393 036813ee 2019-05-09 stsp *new_te = NULL;
5395 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5397 036813ee 2019-05-09 stsp goto done;
5399 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5401 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5402 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5403 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5405 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5407 036813ee 2019-05-09 stsp if (err && *new_te) {
5408 56e0773d 2019-11-28 stsp free(*new_te);
5409 036813ee 2019-05-09 stsp *new_te = NULL;
5411 036813ee 2019-05-09 stsp return err;
5414 036813ee 2019-05-09 stsp static const struct got_error *
5415 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5416 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5418 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5419 102b254e 2020-10-19 stsp char *ct_name = NULL;
5421 036813ee 2019-05-09 stsp *new_te = NULL;
5423 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5424 036813ee 2019-05-09 stsp if (*new_te == NULL)
5425 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5427 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5429 036813ee 2019-05-09 stsp goto done;
5430 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5431 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5432 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5433 036813ee 2019-05-09 stsp goto done;
5436 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5438 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5439 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5440 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5442 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5444 102b254e 2020-10-19 stsp free(ct_name);
5445 036813ee 2019-05-09 stsp if (err && *new_te) {
5446 56e0773d 2019-11-28 stsp free(*new_te);
5447 036813ee 2019-05-09 stsp *new_te = NULL;
5449 036813ee 2019-05-09 stsp return err;
5452 036813ee 2019-05-09 stsp static const struct got_error *
5453 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5454 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5456 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5457 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5459 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5461 036813ee 2019-05-09 stsp return err;
5462 036813ee 2019-05-09 stsp if (new_pe == NULL)
5463 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5464 036813ee 2019-05-09 stsp return NULL;
5467 afa376bf 2019-05-09 stsp static const struct got_error *
5468 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5469 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5471 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5472 5f8a88c6 2019-08-03 stsp unsigned char status;
5474 0ff8d236 2021-09-28 stsp if (status_cb == NULL) /* no commit progress output desired */
5475 0ff8d236 2021-09-28 stsp return NULL;
5477 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5478 afa376bf 2019-05-09 stsp ct_path++;
5480 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5481 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5483 5f8a88c6 2019-08-03 stsp status = ct->status;
5485 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5486 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5489 036813ee 2019-05-09 stsp static const struct got_error *
5490 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5491 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5493 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5494 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5495 44d03001 2019-05-09 stsp char *te_path;
5497 44d03001 2019-05-09 stsp *modified = 0;
5499 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5500 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5501 44d03001 2019-05-09 stsp te->name) == -1)
5502 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5504 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5505 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5506 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5507 44d03001 2019-05-09 stsp strlen(te_path));
5508 62d463ca 2020-10-20 naddy if (*modified)
5512 44d03001 2019-05-09 stsp free(te_path);
5513 44d03001 2019-05-09 stsp return err;
5516 44d03001 2019-05-09 stsp static const struct got_error *
5517 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5518 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5519 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5521 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5522 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5524 036813ee 2019-05-09 stsp *ctp = NULL;
5526 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5527 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5528 036813ee 2019-05-09 stsp char *ct_name = NULL;
5529 036813ee 2019-05-09 stsp int path_matches;
5531 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5532 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5533 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5534 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5537 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5538 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5542 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5545 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5547 036813ee 2019-05-09 stsp return err;
5548 036813ee 2019-05-09 stsp if (!path_matches)
5551 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5553 d34b633e 2020-10-19 stsp return err;
5555 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5556 d34b633e 2020-10-19 stsp free(ct_name);
5559 d34b633e 2020-10-19 stsp free(ct_name);
5561 036813ee 2019-05-09 stsp *ctp = ct;
5565 2b496619 2019-07-10 stsp return err;
5568 2b496619 2019-07-10 stsp static const struct got_error *
5569 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5570 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5571 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5572 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5573 2b496619 2019-07-10 stsp struct got_repository *repo)
5575 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5576 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5577 2b496619 2019-07-10 stsp char *subtree_path;
5578 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5579 ba580f68 2020-03-22 stsp int nentries;
5581 2b496619 2019-07-10 stsp *new_tep = NULL;
5583 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5584 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5585 2b496619 2019-07-10 stsp child_path) == -1)
5586 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5588 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5589 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5590 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5591 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5593 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5594 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5595 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5596 2b496619 2019-07-10 stsp goto done;
5598 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5599 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5600 2b496619 2019-07-10 stsp if (err) {
5601 56e0773d 2019-11-28 stsp free(new_te);
5602 2b496619 2019-07-10 stsp goto done;
5604 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5607 2b496619 2019-07-10 stsp free(subtree_path);
5608 2b496619 2019-07-10 stsp if (err == NULL)
5609 2b496619 2019-07-10 stsp *new_tep = new_te;
5610 036813ee 2019-05-09 stsp return err;
5613 036813ee 2019-05-09 stsp static const struct got_error *
5614 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5615 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5616 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5617 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5618 036813ee 2019-05-09 stsp struct got_repository *repo)
5620 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5621 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5622 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5623 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5625 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5626 ba580f68 2020-03-22 stsp *nentries = 0;
5628 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5629 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5630 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5631 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5633 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5634 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5635 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5638 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5639 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5642 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5643 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5645 036813ee 2019-05-09 stsp goto done;
5647 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5648 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5649 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5651 036813ee 2019-05-09 stsp goto done;
5652 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5654 afa376bf 2019-05-09 stsp goto done;
5655 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5656 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5658 2f51b5b3 2019-05-09 stsp goto done;
5659 ba580f68 2020-03-22 stsp (*nentries)++;
5661 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5662 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5663 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5664 2b496619 2019-07-10 stsp == NULL) {
5665 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5666 2b496619 2019-07-10 stsp child_path, path_base_tree,
5667 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5670 2b496619 2019-07-10 stsp goto done;
5671 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5673 2b496619 2019-07-10 stsp goto done;
5674 ba580f68 2020-03-22 stsp (*nentries)++;
5679 2f51b5b3 2019-05-09 stsp if (base_tree) {
5680 56e0773d 2019-11-28 stsp int i, nbase_entries;
5681 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5682 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5683 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5684 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5686 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5687 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5688 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5689 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5691 63c5ca5d 2019-08-24 stsp goto done;
5692 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5694 63c5ca5d 2019-08-24 stsp goto done;
5695 ba580f68 2020-03-22 stsp (*nentries)++;
5699 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5700 44d03001 2019-05-09 stsp int modified;
5701 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5703 036813ee 2019-05-09 stsp goto done;
5704 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5705 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5707 2f51b5b3 2019-05-09 stsp goto done;
5708 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5709 44d03001 2019-05-09 stsp if (modified) {
5710 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5711 ba580f68 2020-03-22 stsp int nsubentries;
5712 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5713 ba580f68 2020-03-22 stsp &nsubentries, te,
5714 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5715 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5717 44d03001 2019-05-09 stsp goto done;
5718 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5719 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5720 ba580f68 2020-03-22 stsp free(new_id);
5723 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5724 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5725 56e0773d 2019-11-28 stsp free(new_id);
5727 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5729 036813ee 2019-05-09 stsp goto done;
5730 ba580f68 2020-03-22 stsp (*nentries)++;
5734 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5735 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5737 f66c734c 2019-09-22 stsp goto done;
5739 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5740 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5741 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5742 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5743 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5744 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5746 2f51b5b3 2019-05-09 stsp goto done;
5747 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5749 2f51b5b3 2019-05-09 stsp goto done;
5750 ba580f68 2020-03-22 stsp (*nentries)++;
5752 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5753 b416585c 2019-05-13 stsp status_arg);
5755 afa376bf 2019-05-09 stsp goto done;
5757 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5758 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5760 2f51b5b3 2019-05-09 stsp goto done;
5761 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5763 2f51b5b3 2019-05-09 stsp goto done;
5764 ba580f68 2020-03-22 stsp (*nentries)++;
5769 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5770 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5772 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5773 2e1fa222 2020-07-23 stsp return err;
5776 2e1fa222 2020-07-23 stsp static const struct got_error *
5777 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5778 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5779 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5780 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5782 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5783 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5784 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5786 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5787 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5788 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5790 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5792 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5793 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5794 437adc9d 2020-12-10 yzhong if (err)
5795 437adc9d 2020-12-10 yzhong goto done;
5798 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5799 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5800 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5801 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5802 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5803 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5804 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5805 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5807 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5808 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5809 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5810 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5811 72fd46fa 2019-09-06 stsp !have_staged_files);
5813 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5814 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5815 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5816 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5817 72fd46fa 2019-09-06 stsp !have_staged_files);
5819 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5821 437adc9d 2020-12-10 yzhong goto done;
5822 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5823 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5824 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5825 3969253a 2020-03-07 stsp if (err) {
5826 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5827 437adc9d 2020-12-10 yzhong goto done;
5829 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5830 3969253a 2020-03-07 stsp if (err) {
5831 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5832 437adc9d 2020-12-10 yzhong goto done;
5835 437adc9d 2020-12-10 yzhong free(relpath);
5836 437adc9d 2020-12-10 yzhong relpath = NULL;
5839 437adc9d 2020-12-10 yzhong free(relpath);
5840 d56d26ce 2019-05-10 stsp return err;
5844 d56d26ce 2019-05-10 stsp static const struct got_error *
5845 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5846 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5847 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5848 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5849 735ef5ac 2019-08-03 stsp int ood_errcode)
5851 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5852 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
5853 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5855 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5856 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5857 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5858 1a36436d 2019-06-10 stsp return NULL;
5860 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5861 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5863 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5865 a44927cc 2022-04-07 stsp goto done;
5866 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5867 9bead371 2019-07-28 stsp if (err) {
5868 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5869 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5870 1a36436d 2019-06-10 stsp goto done;
5871 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5872 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5874 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5875 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
5877 a44927cc 2022-04-07 stsp goto done;
5878 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5879 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5880 1a36436d 2019-06-10 stsp goto done;
5881 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5885 a44927cc 2022-04-07 stsp if (commit)
5886 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
5887 1a36436d 2019-06-10 stsp return err;
5890 336075a4 2022-06-25 op static const struct got_error *
5891 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5892 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5893 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5894 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5895 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5896 2a47b1e5 2022-11-01 stsp const char *author, const char *committer, char *diff_path,
5897 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5898 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5899 afa376bf 2019-05-09 stsp struct got_repository *repo)
5901 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5902 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5903 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5904 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5905 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5906 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5907 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5908 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5909 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5910 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5911 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5912 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5913 f8399b8f 2022-07-22 stsp time_t timestamp;
5915 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5917 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5919 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5921 588edf97 2019-05-10 stsp goto done;
5923 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5925 588edf97 2019-05-10 stsp goto done;
5927 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5928 2a47b1e5 2022-11-01 stsp err = commit_msg_cb(commitable_paths, diff_path,
5929 2a47b1e5 2022-11-01 stsp &logmsg, commit_arg);
5934 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5935 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5939 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5940 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5941 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5942 cf066bf8 2019-05-09 stsp char *ondisk_path;
5944 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5945 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5946 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5949 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5950 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5951 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5954 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5955 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5956 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5957 cf066bf8 2019-05-09 stsp goto done;
5959 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5960 2e1fa222 2020-07-23 stsp free(ondisk_path);
5962 cf066bf8 2019-05-09 stsp goto done;
5965 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5966 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5967 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5969 036813ee 2019-05-09 stsp goto done;
5971 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5973 de18fc63 2019-05-09 stsp goto done;
5974 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5975 f259c4c1 2021-09-24 stsp nparents++;
5976 f259c4c1 2021-09-24 stsp if (parent_id2) {
5977 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
5979 f259c4c1 2021-09-24 stsp goto done;
5980 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5981 f259c4c1 2021-09-24 stsp nparents++;
5983 f8399b8f 2022-07-22 stsp timestamp = time(NULL);
5984 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5985 f8399b8f 2022-07-22 stsp nparents, author, timestamp, committer, timestamp, logmsg, repo);
5986 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5987 33ad4cbe 2019-05-12 jcs free(logmsg);
5989 9d40349a 2019-05-09 stsp goto done;
5991 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5992 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5993 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5994 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5995 09f5bd90 2019-05-09 stsp goto done;
5997 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5998 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6000 09f5bd90 2019-05-09 stsp goto done;
6001 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6003 ebf99748 2019-05-09 stsp goto done;
6004 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6005 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6006 09f5bd90 2019-05-09 stsp goto done;
6008 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
6009 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
6011 f2c16586 2019-05-09 stsp goto done;
6012 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
6014 f2c16586 2019-05-09 stsp goto done;
6016 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6018 09f5bd90 2019-05-09 stsp goto done;
6020 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
6022 ebf99748 2019-05-09 stsp goto done;
6024 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
6025 588edf97 2019-05-10 stsp if (head_tree)
6026 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
6027 588edf97 2019-05-10 stsp if (head_commit)
6028 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
6029 09f5bd90 2019-05-09 stsp free(head_commit_id2);
6030 2f17228e 2019-05-12 stsp if (head_ref2) {
6031 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
6032 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
6033 2f17228e 2019-05-12 stsp err = unlockerr;
6034 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
6036 39cd0ff6 2019-07-12 stsp return err;
6039 5c1e53bc 2019-07-28 stsp static const struct got_error *
6040 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
6041 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
6043 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
6044 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
6046 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
6047 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
6048 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
6050 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
6051 5c1e53bc 2019-07-28 stsp ct_path++;
6053 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
6054 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
6058 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
6059 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
6061 5c1e53bc 2019-07-28 stsp return NULL;
6064 f0b75401 2019-08-03 stsp static const struct got_error *
6065 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
6067 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
6069 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6070 f0b75401 2019-08-03 stsp *have_staged_files = 1;
6071 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
6074 f0b75401 2019-08-03 stsp return NULL;
6077 5f8a88c6 2019-08-03 stsp static const struct got_error *
6078 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
6079 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
6081 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
6082 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
6084 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6085 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
6087 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6088 5f8a88c6 2019-08-03 stsp if (ie == NULL)
6089 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6090 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6091 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
6092 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
6095 5f8a88c6 2019-08-03 stsp return NULL;
6098 39cd0ff6 2019-07-12 stsp const struct got_error *
6099 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
6100 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
6101 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
6102 2a47b1e5 2022-11-01 stsp int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6103 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
6104 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
6106 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6107 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
6108 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
6109 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6110 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6111 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
6112 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
6113 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6114 2a47b1e5 2022-11-01 stsp char *diff_path = NULL;
6115 f0b75401 2019-08-03 stsp int have_staged_files = 0;
6117 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
6119 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6120 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6122 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
6124 39cd0ff6 2019-07-12 stsp goto done;
6126 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6128 39cd0ff6 2019-07-12 stsp goto done;
6130 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6132 39cd0ff6 2019-07-12 stsp goto done;
6134 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6136 39cd0ff6 2019-07-12 stsp goto done;
6138 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6139 5f8a88c6 2019-08-03 stsp &have_staged_files);
6140 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
6141 5f8a88c6 2019-08-03 stsp goto done;
6142 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
6143 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
6145 5f8a88c6 2019-08-03 stsp goto done;
6148 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6149 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
6150 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
6151 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
6152 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
6153 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6154 2a47b1e5 2022-11-01 stsp cc_arg.diff_header_shown = 0;
6155 2a47b1e5 2022-11-01 stsp if (show_diff) {
6156 2a47b1e5 2022-11-01 stsp err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6157 2a47b1e5 2022-11-01 stsp GOT_TMPDIR_STR "/got-diff");
6159 2a47b1e5 2022-11-01 stsp goto done;
6160 2a47b1e5 2022-11-01 stsp cc_arg.f1 = got_opentemp();
6161 2a47b1e5 2022-11-01 stsp if (cc_arg.f1 == NULL) {
6162 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6163 2a47b1e5 2022-11-01 stsp goto done;
6165 2a47b1e5 2022-11-01 stsp cc_arg.f2 = got_opentemp();
6166 2a47b1e5 2022-11-01 stsp if (cc_arg.f2 == NULL) {
6167 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("got_opentemp");
6168 2a47b1e5 2022-11-01 stsp goto done;
6172 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6173 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6174 4ba2e955 2022-09-02 sh+got collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6176 5c1e53bc 2019-07-28 stsp goto done;
6179 2a47b1e5 2022-11-01 stsp if (show_diff) {
6180 2a47b1e5 2022-11-01 stsp if (fflush(cc_arg.diff_outfile) == EOF) {
6181 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fflush");
6182 2a47b1e5 2022-11-01 stsp goto done;
6186 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6187 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6188 39cd0ff6 2019-07-12 stsp goto done;
6191 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6192 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
6194 5c1e53bc 2019-07-28 stsp goto done;
6197 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6198 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
6199 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
6201 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
6202 f0b75401 2019-08-03 stsp ct_path++;
6203 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
6204 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6205 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6207 b50cabdf 2019-07-12 stsp goto done;
6211 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
6212 2a47b1e5 2022-11-01 stsp head_commit_id, NULL, worktree, author, committer, diff_path,
6213 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6215 39cd0ff6 2019-07-12 stsp goto done;
6217 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6218 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
6219 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6220 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
6221 39cd0ff6 2019-07-12 stsp err = sync_err;
6223 39cd0ff6 2019-07-12 stsp if (fileindex)
6224 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
6225 39cd0ff6 2019-07-12 stsp free(fileindex_path);
6226 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6227 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
6228 39cd0ff6 2019-07-12 stsp err = unlockerr;
6229 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6230 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
6231 39cd0ff6 2019-07-12 stsp free_commitable(ct);
6233 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
6234 2a47b1e5 2022-11-01 stsp if (diff_path && unlink(diff_path) == -1 && err == NULL)
6235 2a47b1e5 2022-11-01 stsp err = got_error_from_errno2("unlink", diff_path);
6236 2a47b1e5 2022-11-01 stsp free(diff_path);
6237 2a47b1e5 2022-11-01 stsp if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6238 2a47b1e5 2022-11-01 stsp err == NULL)
6239 2a47b1e5 2022-11-01 stsp err = got_error_from_errno("fclose");
6240 c4296144 2019-05-09 stsp return err;
6243 8656d6c4 2019-05-20 stsp const char *
6244 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
6246 8656d6c4 2019-05-20 stsp return ct->path;
6249 8656d6c4 2019-05-20 stsp unsigned int
6250 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
6252 8656d6c4 2019-05-20 stsp return ct->status;
6255 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
6256 818c7501 2019-07-11 stsp struct got_worktree *worktree;
6257 818c7501 2019-07-11 stsp struct got_repository *repo;
6260 818c7501 2019-07-11 stsp static const struct got_error *
6261 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6263 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6264 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
6265 818c7501 2019-07-11 stsp unsigned char status;
6266 818c7501 2019-07-11 stsp struct stat sb;
6267 818c7501 2019-07-11 stsp char *ondisk_path;
6269 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
6270 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6271 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
6272 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
6274 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6276 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
6278 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
6279 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6280 818c7501 2019-07-11 stsp free(ondisk_path);
6282 818c7501 2019-07-11 stsp return err;
6284 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
6285 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
6286 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6287 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6289 818c7501 2019-07-11 stsp return NULL;
6292 818c7501 2019-07-11 stsp const struct got_error *
6293 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6294 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6295 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
6296 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6298 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6299 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6300 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6301 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6302 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6303 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6304 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6306 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6307 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6308 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6310 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6312 818c7501 2019-07-11 stsp return err;
6314 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6316 818c7501 2019-07-11 stsp goto done;
6318 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6319 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6320 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6323 818c7501 2019-07-11 stsp goto done;
6325 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6327 818c7501 2019-07-11 stsp goto done;
6329 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6331 818c7501 2019-07-11 stsp goto done;
6333 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6335 818c7501 2019-07-11 stsp goto done;
6337 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6340 e51d7b55 2020-01-04 stsp goto done;
6342 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6344 818c7501 2019-07-11 stsp goto done;
6345 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6346 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6347 e51d7b55 2020-01-04 stsp goto done;
6350 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6351 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6353 818c7501 2019-07-11 stsp goto done;
6354 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6356 818c7501 2019-07-11 stsp goto done;
6358 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6360 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6362 818c7501 2019-07-11 stsp goto done;
6364 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6366 818c7501 2019-07-11 stsp goto done;
6368 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6369 818c7501 2019-07-11 stsp worktree->base_commit_id);
6371 818c7501 2019-07-11 stsp goto done;
6372 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6374 818c7501 2019-07-11 stsp goto done;
6376 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6378 818c7501 2019-07-11 stsp goto done;
6380 818c7501 2019-07-11 stsp free(fileindex_path);
6381 818c7501 2019-07-11 stsp free(tmp_branch_name);
6382 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6383 818c7501 2019-07-11 stsp free(branch_ref_name);
6384 818c7501 2019-07-11 stsp if (branch_ref)
6385 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6386 818c7501 2019-07-11 stsp if (wt_branch)
6387 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6388 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6389 818c7501 2019-07-11 stsp if (err) {
6390 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6391 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6392 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6394 818c7501 2019-07-11 stsp if (*tmp_branch) {
6395 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6396 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6398 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6399 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6400 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6402 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6404 818c7501 2019-07-11 stsp return err;
6407 818c7501 2019-07-11 stsp const struct got_error *
6408 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6409 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6410 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6411 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6413 818c7501 2019-07-11 stsp const struct got_error *err;
6414 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6415 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6416 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6417 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6418 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6420 818c7501 2019-07-11 stsp *commit_id = NULL;
6421 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6422 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6423 3e3a69f1 2019-07-25 stsp *branch = NULL;
6424 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6426 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6428 3e3a69f1 2019-07-25 stsp return err;
6430 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6432 f032f1f7 2019-08-04 stsp goto done;
6434 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6435 f032f1f7 2019-08-04 stsp &have_staged_files);
6436 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6437 f032f1f7 2019-08-04 stsp goto done;
6438 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6439 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6440 3e3a69f1 2019-07-25 stsp goto done;
6443 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6445 f032f1f7 2019-08-04 stsp goto done;
6447 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6449 818c7501 2019-07-11 stsp goto done;
6451 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6453 818c7501 2019-07-11 stsp goto done;
6455 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6457 818c7501 2019-07-11 stsp goto done;
6459 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6461 818c7501 2019-07-11 stsp goto done;
6463 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6464 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6466 818c7501 2019-07-11 stsp goto done;
6468 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6470 818c7501 2019-07-11 stsp goto done;
6472 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6474 818c7501 2019-07-11 stsp goto done;
6476 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6477 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6479 818c7501 2019-07-11 stsp goto done;
6481 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6483 818c7501 2019-07-11 stsp goto done;
6485 818c7501 2019-07-11 stsp free(commit_ref_name);
6486 818c7501 2019-07-11 stsp free(branch_ref_name);
6487 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6488 818c7501 2019-07-11 stsp if (commit_ref)
6489 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6490 818c7501 2019-07-11 stsp if (branch_ref)
6491 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6492 818c7501 2019-07-11 stsp if (err) {
6493 818c7501 2019-07-11 stsp free(*commit_id);
6494 818c7501 2019-07-11 stsp *commit_id = NULL;
6495 818c7501 2019-07-11 stsp if (*tmp_branch) {
6496 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6497 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6499 818c7501 2019-07-11 stsp if (*new_base_branch) {
6500 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6501 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6503 818c7501 2019-07-11 stsp if (*branch) {
6504 818c7501 2019-07-11 stsp got_ref_close(*branch);
6505 818c7501 2019-07-11 stsp *branch = NULL;
6507 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6508 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6509 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6511 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6513 818c7501 2019-07-11 stsp return err;
6516 818c7501 2019-07-11 stsp const struct got_error *
6517 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6519 818c7501 2019-07-11 stsp const struct got_error *err;
6520 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6522 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6524 818c7501 2019-07-11 stsp return err;
6526 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6527 818c7501 2019-07-11 stsp free(tmp_branch_name);
6528 818c7501 2019-07-11 stsp return NULL;
6531 818c7501 2019-07-11 stsp static const struct got_error *
6532 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6533 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
6535 0ebf8283 2019-07-24 stsp *logmsg = arg;
6536 818c7501 2019-07-11 stsp return NULL;
6539 818c7501 2019-07-11 stsp static const struct got_error *
6540 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6541 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6542 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6543 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6545 818c7501 2019-07-11 stsp return NULL;
6548 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6549 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6550 01757395 2019-07-12 stsp void *progress_arg;
6551 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6554 01757395 2019-07-12 stsp static const struct got_error *
6555 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6557 01757395 2019-07-12 stsp const struct got_error *err;
6558 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6560 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6562 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6564 01757395 2019-07-12 stsp return err;
6566 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6567 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6568 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6569 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6570 01757395 2019-07-12 stsp return NULL;
6572 01757395 2019-07-12 stsp p = strdup(path);
6573 01757395 2019-07-12 stsp if (p == NULL)
6574 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6576 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6577 01757395 2019-07-12 stsp if (err || new == NULL)
6579 01757395 2019-07-12 stsp return err;
6583 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6585 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6587 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6588 01757395 2019-07-12 stsp free((char *)pe->path);
6590 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6593 0ebf8283 2019-07-24 stsp static const struct got_error *
6594 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6595 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6597 818c7501 2019-07-11 stsp const struct got_error *err;
6598 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6600 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6601 818c7501 2019-07-11 stsp if (err) {
6602 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6603 818c7501 2019-07-11 stsp goto done;
6604 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6606 818c7501 2019-07-11 stsp goto done;
6607 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6609 818c7501 2019-07-11 stsp goto done;
6610 de05890f 2020-03-05 stsp } else if (is_rebase) {
6611 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6614 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6616 818c7501 2019-07-11 stsp goto done;
6617 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6618 818c7501 2019-07-11 stsp free(stored_id);
6619 818c7501 2019-07-11 stsp if (cmp != 0) {
6620 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6621 818c7501 2019-07-11 stsp goto done;
6625 0ebf8283 2019-07-24 stsp if (commit_ref)
6626 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6627 0ebf8283 2019-07-24 stsp return err;
6630 0ebf8283 2019-07-24 stsp static const struct got_error *
6631 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6632 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6633 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6634 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6635 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6636 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6638 0ebf8283 2019-07-24 stsp const struct got_error *err;
6639 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6640 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6641 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6643 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6645 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6647 0ebf8283 2019-07-24 stsp return err;
6649 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6650 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6651 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6652 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6653 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6654 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6655 818c7501 2019-07-11 stsp if (commit_ref)
6656 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6657 818c7501 2019-07-11 stsp return err;
6660 818c7501 2019-07-11 stsp const struct got_error *
6661 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6662 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6663 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6664 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6665 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6666 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6668 0ebf8283 2019-07-24 stsp const struct got_error *err;
6669 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6671 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6673 0ebf8283 2019-07-24 stsp return err;
6675 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6677 0ebf8283 2019-07-24 stsp goto done;
6679 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6680 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6681 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6683 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6684 0ebf8283 2019-07-24 stsp return err;
6687 0ebf8283 2019-07-24 stsp const struct got_error *
6688 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6689 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6690 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6691 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6692 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6693 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6695 0ebf8283 2019-07-24 stsp const struct got_error *err;
6696 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6698 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6700 0ebf8283 2019-07-24 stsp return err;
6702 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6704 0ebf8283 2019-07-24 stsp goto done;
6706 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6707 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6708 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6710 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6711 0ebf8283 2019-07-24 stsp return err;
6714 0ebf8283 2019-07-24 stsp static const struct got_error *
6715 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6716 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6717 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6718 598eac43 2022-07-22 stsp struct got_reference *tmp_branch, const char *committer,
6719 598eac43 2022-07-22 stsp struct got_commit_object *orig_commit, const char *new_logmsg,
6720 598eac43 2022-07-22 stsp struct got_repository *repo)
6722 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6723 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6724 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6725 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6726 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6727 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6728 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6730 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
6731 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6732 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6734 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6736 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6738 3e3a69f1 2019-07-25 stsp return err;
6740 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6741 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6742 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6743 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6745 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6746 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6748 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6749 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6750 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6751 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6752 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6753 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6755 01757395 2019-07-12 stsp if (merged_paths) {
6756 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6757 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6758 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6759 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6762 01757395 2019-07-12 stsp goto done;
6765 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6766 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6768 01757395 2019-07-12 stsp goto done;
6771 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6772 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6773 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6775 a0e95631 2019-07-12 stsp goto done;
6776 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6777 a0e95631 2019-07-12 stsp goto done;
6780 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6782 edd02c5e 2019-07-11 stsp goto done;
6784 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6786 818c7501 2019-07-11 stsp goto done;
6788 5943eee2 2019-08-13 stsp if (new_logmsg) {
6789 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6790 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6791 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6792 5943eee2 2019-08-13 stsp goto done;
6795 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6797 5943eee2 2019-08-13 stsp goto done;
6800 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6801 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6802 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6803 50e7a649 2022-07-22 stsp committer ? committer :
6804 2a47b1e5 2022-11-01 stsp got_object_commit_get_committer(orig_commit), NULL,
6805 50e7a649 2022-07-22 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6807 a0e95631 2019-07-12 stsp goto done;
6809 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6811 a0e95631 2019-07-12 stsp goto done;
6813 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6815 a0e95631 2019-07-12 stsp goto done;
6817 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6818 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6819 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6820 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6821 a0e95631 2019-07-12 stsp err = sync_err;
6823 a0e95631 2019-07-12 stsp free(fileindex_path);
6824 a0e95631 2019-07-12 stsp free(head_commit_id);
6825 a0e95631 2019-07-12 stsp if (head_ref)
6826 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6827 818c7501 2019-07-11 stsp if (err) {
6828 818c7501 2019-07-11 stsp free(*new_commit_id);
6829 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6831 818c7501 2019-07-11 stsp return err;
6834 818c7501 2019-07-11 stsp const struct got_error *
6835 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6836 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6837 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6838 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6839 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6841 0ebf8283 2019-07-24 stsp const struct got_error *err;
6842 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6843 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6844 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6846 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6848 0ebf8283 2019-07-24 stsp return err;
6850 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6852 0ebf8283 2019-07-24 stsp goto done;
6853 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6855 0ebf8283 2019-07-24 stsp goto done;
6856 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6857 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6858 0ebf8283 2019-07-24 stsp goto done;
6861 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6862 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6863 598eac43 2022-07-22 stsp NULL, repo);
6865 0ebf8283 2019-07-24 stsp if (commit_ref)
6866 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6867 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6868 0ebf8283 2019-07-24 stsp free(commit_id);
6869 0ebf8283 2019-07-24 stsp return err;
6872 0ebf8283 2019-07-24 stsp const struct got_error *
6873 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6874 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6875 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6876 598eac43 2022-07-22 stsp const char *committer, struct got_commit_object *orig_commit,
6877 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6878 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6880 0ebf8283 2019-07-24 stsp const struct got_error *err;
6881 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6882 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6884 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6886 0ebf8283 2019-07-24 stsp return err;
6888 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6890 0ebf8283 2019-07-24 stsp goto done;
6892 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6893 598eac43 2022-07-22 stsp worktree, fileindex, tmp_branch, committer, orig_commit,
6894 598eac43 2022-07-22 stsp new_logmsg, repo);
6896 0ebf8283 2019-07-24 stsp if (commit_ref)
6897 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6898 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6899 0ebf8283 2019-07-24 stsp return err;
6902 0ebf8283 2019-07-24 stsp const struct got_error *
6903 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6904 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6906 3e3a69f1 2019-07-25 stsp if (fileindex)
6907 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6908 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6911 69844fba 2019-07-11 stsp static const struct got_error *
6912 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6914 69844fba 2019-07-11 stsp const struct got_error *err;
6915 69844fba 2019-07-11 stsp struct got_reference *ref;
6917 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6918 69844fba 2019-07-11 stsp if (err) {
6919 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6920 69844fba 2019-07-11 stsp return NULL;
6921 69844fba 2019-07-11 stsp return err;
6924 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6925 69844fba 2019-07-11 stsp got_ref_close(ref);
6926 69844fba 2019-07-11 stsp return err;
6929 69844fba 2019-07-11 stsp static const struct got_error *
6930 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6932 69844fba 2019-07-11 stsp const struct got_error *err;
6933 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6934 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6936 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6938 69844fba 2019-07-11 stsp goto done;
6939 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6941 69844fba 2019-07-11 stsp goto done;
6943 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6945 69844fba 2019-07-11 stsp goto done;
6946 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6948 69844fba 2019-07-11 stsp goto done;
6950 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6952 69844fba 2019-07-11 stsp goto done;
6953 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6955 69844fba 2019-07-11 stsp goto done;
6957 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6959 69844fba 2019-07-11 stsp goto done;
6960 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6962 69844fba 2019-07-11 stsp goto done;
6965 69844fba 2019-07-11 stsp free(tmp_branch_name);
6966 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6967 69844fba 2019-07-11 stsp free(branch_ref_name);
6968 69844fba 2019-07-11 stsp free(commit_ref_name);
6969 e600f124 2021-03-21 stsp return err;
6972 336075a4 2022-06-25 op static const struct got_error *
6973 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6974 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6976 e600f124 2021-03-21 stsp const struct got_error *err;
6977 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6978 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6979 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6980 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6981 e600f124 2021-03-21 stsp char *refname = NULL;
6983 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6984 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6985 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6986 e600f124 2021-03-21 stsp branch_name += 11;
6988 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6990 e600f124 2021-03-21 stsp return err;
6992 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6993 e600f124 2021-03-21 stsp new_id_str) == -1) {
6994 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6995 e600f124 2021-03-21 stsp goto done;
6998 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
7000 e600f124 2021-03-21 stsp goto done;
7002 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
7004 e600f124 2021-03-21 stsp goto done;
7006 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
7008 e600f124 2021-03-21 stsp free(new_id_str);
7009 e600f124 2021-03-21 stsp free(refname);
7010 e600f124 2021-03-21 stsp free(old_commit_id);
7012 e600f124 2021-03-21 stsp got_ref_close(ref);
7013 69844fba 2019-07-11 stsp return err;
7016 818c7501 2019-07-11 stsp const struct got_error *
7017 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
7018 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
7019 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
7020 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
7022 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7023 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
7024 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7026 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7028 818c7501 2019-07-11 stsp return err;
7030 e600f124 2021-03-21 stsp if (create_backup) {
7031 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7032 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
7034 e600f124 2021-03-21 stsp goto done;
7037 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7039 818c7501 2019-07-11 stsp goto done;
7041 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
7043 818c7501 2019-07-11 stsp goto done;
7045 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
7047 818c7501 2019-07-11 stsp goto done;
7049 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
7051 a615e0e7 2020-12-16 stsp goto done;
7053 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7055 a615e0e7 2020-12-16 stsp goto done;
7056 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7057 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7058 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7059 a615e0e7 2020-12-16 stsp err = sync_err;
7061 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7062 a615e0e7 2020-12-16 stsp free(fileindex_path);
7063 818c7501 2019-07-11 stsp free(new_head_commit_id);
7064 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7065 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7066 818c7501 2019-07-11 stsp err = unlockerr;
7067 818c7501 2019-07-11 stsp return err;
7070 818c7501 2019-07-11 stsp const struct got_error *
7071 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
7072 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7073 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
7074 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
7076 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
7077 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
7078 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
7079 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7080 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
7081 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7082 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
7084 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
7086 818c7501 2019-07-11 stsp return err;
7088 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7089 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7091 a44927cc 2022-04-07 stsp goto done;
7093 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
7094 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
7096 818c7501 2019-07-11 stsp goto done;
7098 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
7100 818c7501 2019-07-11 stsp goto done;
7103 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
7104 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
7105 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
7107 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
7109 818c7501 2019-07-11 stsp goto done;
7111 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7113 818c7501 2019-07-11 stsp goto done;
7115 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7116 a44927cc 2022-04-07 stsp worktree->path_prefix);
7118 ca355955 2019-07-12 stsp goto done;
7120 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
7122 ca355955 2019-07-12 stsp goto done;
7124 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7126 818c7501 2019-07-11 stsp goto done;
7128 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7129 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7130 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7131 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7132 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7133 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7134 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7135 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7136 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
7137 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7139 1f1abb7e 2019-08-08 stsp goto sync;
7141 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7142 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
7144 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7145 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
7146 ca355955 2019-07-12 stsp err = sync_err;
7148 818c7501 2019-07-11 stsp got_ref_close(resolved);
7149 a3a2faf2 2019-07-12 stsp free(tree_id);
7150 818c7501 2019-07-11 stsp free(commit_id);
7151 a44927cc 2022-04-07 stsp if (commit)
7152 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7153 0ebf8283 2019-07-24 stsp if (fileindex)
7154 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
7155 0ebf8283 2019-07-24 stsp free(fileindex_path);
7157 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7158 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7159 0ebf8283 2019-07-24 stsp err = unlockerr;
7160 0ebf8283 2019-07-24 stsp return err;
7163 0ebf8283 2019-07-24 stsp const struct got_error *
7164 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7165 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7166 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7167 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7169 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7170 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7171 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
7172 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
7173 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7174 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
7175 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
7176 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7178 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7179 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7180 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7181 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7183 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7185 0ebf8283 2019-07-24 stsp return err;
7187 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7189 0ebf8283 2019-07-24 stsp goto done;
7191 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
7192 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
7193 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7196 0ebf8283 2019-07-24 stsp goto done;
7198 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7200 0ebf8283 2019-07-24 stsp goto done;
7202 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7204 0ebf8283 2019-07-24 stsp goto done;
7206 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7207 0ebf8283 2019-07-24 stsp worktree);
7209 0ebf8283 2019-07-24 stsp goto done;
7211 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7214 0ebf8283 2019-07-24 stsp goto done;
7216 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7218 0ebf8283 2019-07-24 stsp goto done;
7220 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
7222 0ebf8283 2019-07-24 stsp goto done;
7224 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7225 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7227 0ebf8283 2019-07-24 stsp goto done;
7228 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
7230 0ebf8283 2019-07-24 stsp goto done;
7231 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7232 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
7233 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
7234 0ebf8283 2019-07-24 stsp goto done;
7237 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
7238 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7240 0ebf8283 2019-07-24 stsp goto done;
7241 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
7243 0ebf8283 2019-07-24 stsp goto done;
7245 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
7247 0ebf8283 2019-07-24 stsp goto done;
7249 0ebf8283 2019-07-24 stsp free(fileindex_path);
7250 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7251 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7252 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7253 0ebf8283 2019-07-24 stsp if (wt_branch)
7254 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
7255 0ebf8283 2019-07-24 stsp if (err) {
7256 0ebf8283 2019-07-24 stsp if (*branch_ref) {
7257 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
7258 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7260 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7261 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7262 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7264 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7265 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7266 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7267 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7269 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
7271 0ebf8283 2019-07-24 stsp return err;
7274 0ebf8283 2019-07-24 stsp const struct got_error *
7275 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
7276 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
7278 3e3a69f1 2019-07-25 stsp if (fileindex)
7279 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
7280 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
7283 0ebf8283 2019-07-24 stsp const struct got_error *
7284 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
7285 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
7287 0ebf8283 2019-07-24 stsp const struct got_error *err;
7288 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7290 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7292 0ebf8283 2019-07-24 stsp return err;
7294 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7295 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7296 0ebf8283 2019-07-24 stsp return NULL;
7299 0ebf8283 2019-07-24 stsp const struct got_error *
7300 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
7301 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
7302 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7303 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7305 0ebf8283 2019-07-24 stsp const struct got_error *err;
7306 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7307 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7308 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
7309 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7310 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
7311 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
7313 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7314 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7315 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7316 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7318 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7320 3e3a69f1 2019-07-25 stsp return err;
7322 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7324 f032f1f7 2019-08-04 stsp goto done;
7326 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7327 f032f1f7 2019-08-04 stsp &have_staged_files);
7328 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7329 f032f1f7 2019-08-04 stsp goto done;
7330 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7331 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7332 3e3a69f1 2019-07-25 stsp goto done;
7335 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7337 f032f1f7 2019-08-04 stsp goto done;
7339 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7341 0ebf8283 2019-07-24 stsp goto done;
7343 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7345 0ebf8283 2019-07-24 stsp goto done;
7347 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7348 0ebf8283 2019-07-24 stsp worktree);
7350 0ebf8283 2019-07-24 stsp goto done;
7352 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7354 0ebf8283 2019-07-24 stsp goto done;
7356 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7358 0ebf8283 2019-07-24 stsp goto done;
7359 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7361 0ebf8283 2019-07-24 stsp goto done;
7363 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7365 0ebf8283 2019-07-24 stsp goto done;
7366 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7368 0ebf8283 2019-07-24 stsp goto done;
7370 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7372 0ebf8283 2019-07-24 stsp goto done;
7374 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7375 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7376 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7377 0ebf8283 2019-07-24 stsp if (commit_ref)
7378 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7379 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7380 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7381 0ebf8283 2019-07-24 stsp if (err) {
7382 0ebf8283 2019-07-24 stsp free(*commit_id);
7383 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7384 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7385 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7386 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7387 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7388 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7390 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7391 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7392 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7394 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7396 0ebf8283 2019-07-24 stsp return err;
7399 0ebf8283 2019-07-24 stsp static const struct got_error *
7400 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7402 0ebf8283 2019-07-24 stsp const struct got_error *err;
7403 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7404 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7406 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7408 0ebf8283 2019-07-24 stsp goto done;
7409 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7411 0ebf8283 2019-07-24 stsp goto done;
7413 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7414 0ebf8283 2019-07-24 stsp worktree);
7416 0ebf8283 2019-07-24 stsp goto done;
7417 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7419 0ebf8283 2019-07-24 stsp goto done;
7421 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7423 0ebf8283 2019-07-24 stsp goto done;
7424 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7426 0ebf8283 2019-07-24 stsp goto done;
7428 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7430 0ebf8283 2019-07-24 stsp goto done;
7431 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7433 0ebf8283 2019-07-24 stsp goto done;
7435 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7436 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7437 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7438 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7439 0ebf8283 2019-07-24 stsp return err;
7442 0ebf8283 2019-07-24 stsp const struct got_error *
7443 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7444 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7445 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7446 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7448 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7449 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7450 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7451 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7452 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7453 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7455 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7457 0ebf8283 2019-07-24 stsp return err;
7459 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
7460 a44927cc 2022-04-07 stsp worktree->base_commit_id);
7462 a44927cc 2022-04-07 stsp goto done;
7464 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7465 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7467 0ebf8283 2019-07-24 stsp goto done;
7469 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7471 0ebf8283 2019-07-24 stsp goto done;
7473 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7475 0ebf8283 2019-07-24 stsp goto done;
7477 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7478 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7480 0ebf8283 2019-07-24 stsp goto done;
7482 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7484 0ebf8283 2019-07-24 stsp goto done;
7486 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7488 0ebf8283 2019-07-24 stsp goto done;
7490 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7491 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7492 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7493 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7494 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7495 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7496 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7497 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7498 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7499 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7501 1f1abb7e 2019-08-08 stsp goto sync;
7503 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7504 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7506 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7507 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7508 0ebf8283 2019-07-24 stsp err = sync_err;
7510 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7511 0ebf8283 2019-07-24 stsp free(tree_id);
7512 818c7501 2019-07-11 stsp free(fileindex_path);
7514 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7515 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7516 818c7501 2019-07-11 stsp err = unlockerr;
7517 818c7501 2019-07-11 stsp return err;
7520 0ebf8283 2019-07-24 stsp const struct got_error *
7521 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7522 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7523 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7525 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7526 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7527 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7528 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7530 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7532 0ebf8283 2019-07-24 stsp return err;
7534 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7535 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7537 e600f124 2021-03-21 stsp goto done;
7539 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7540 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7542 0ebf8283 2019-07-24 stsp goto done;
7544 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7546 0ebf8283 2019-07-24 stsp goto done;
7548 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7550 0ebf8283 2019-07-24 stsp goto done;
7552 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7554 0ebf8283 2019-07-24 stsp goto done;
7556 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7558 a615e0e7 2020-12-16 stsp goto done;
7560 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7562 a615e0e7 2020-12-16 stsp goto done;
7563 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7564 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7565 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7566 a615e0e7 2020-12-16 stsp err = sync_err;
7568 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7569 a615e0e7 2020-12-16 stsp free(fileindex_path);
7570 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7571 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7572 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7573 0ebf8283 2019-07-24 stsp err = unlockerr;
7574 0ebf8283 2019-07-24 stsp return err;
7577 0ebf8283 2019-07-24 stsp const struct got_error *
7578 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7579 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7581 0ebf8283 2019-07-24 stsp const struct got_error *err;
7582 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7584 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7586 0ebf8283 2019-07-24 stsp return err;
7588 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7590 0ebf8283 2019-07-24 stsp goto done;
7592 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7594 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7595 2822a352 2019-10-15 stsp return err;
7598 2822a352 2019-10-15 stsp const struct got_error *
7599 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7600 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7601 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7602 2822a352 2019-10-15 stsp struct got_repository *repo)
7604 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7605 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7606 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7608 2822a352 2019-10-15 stsp *fileindex = NULL;
7609 2822a352 2019-10-15 stsp *branch_ref = NULL;
7610 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7612 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7614 2822a352 2019-10-15 stsp return err;
7616 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7617 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7618 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7619 2822a352 2019-10-15 stsp "update -b or different branch name required");
7620 2822a352 2019-10-15 stsp goto done;
7623 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7625 2822a352 2019-10-15 stsp goto done;
7627 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7628 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7629 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7630 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7633 2822a352 2019-10-15 stsp goto done;
7635 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7637 2822a352 2019-10-15 stsp goto done;
7639 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7640 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7642 2822a352 2019-10-15 stsp if (err) {
7643 2822a352 2019-10-15 stsp if (*branch_ref) {
7644 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7645 2822a352 2019-10-15 stsp *branch_ref = NULL;
7647 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7648 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7649 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7651 2822a352 2019-10-15 stsp if (*fileindex) {
7652 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7653 2822a352 2019-10-15 stsp *fileindex = NULL;
7655 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7657 0cb83759 2019-08-03 stsp return err;
7660 2822a352 2019-10-15 stsp const struct got_error *
7661 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7662 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7663 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7664 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7665 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7667 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7668 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7669 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7670 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7672 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7674 2822a352 2019-10-15 stsp goto done;
7676 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7678 2822a352 2019-10-15 stsp goto done;
7680 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
7682 a44927cc 2022-04-07 stsp goto done;
7684 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
7685 2822a352 2019-10-15 stsp worktree->path_prefix);
7687 2822a352 2019-10-15 stsp goto done;
7689 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7691 2822a352 2019-10-15 stsp goto done;
7693 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7694 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7696 2822a352 2019-10-15 stsp goto sync;
7698 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7700 2822a352 2019-10-15 stsp goto sync;
7702 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7704 6e210706 2021-01-22 stsp goto sync;
7706 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7708 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7709 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7710 2822a352 2019-10-15 stsp err = sync_err;
7713 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7714 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7715 2822a352 2019-10-15 stsp err = unlockerr;
7716 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7718 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7719 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7720 2822a352 2019-10-15 stsp err = unlockerr;
7721 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7723 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7724 2822a352 2019-10-15 stsp free(fileindex_path);
7725 2822a352 2019-10-15 stsp free(tree_id);
7726 a44927cc 2022-04-07 stsp if (commit)
7727 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7729 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7730 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7731 2822a352 2019-10-15 stsp err = unlockerr;
7732 2822a352 2019-10-15 stsp return err;
7735 2822a352 2019-10-15 stsp const struct got_error *
7736 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7737 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7738 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7740 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7742 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7744 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7746 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7747 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7748 8b692cd0 2019-10-21 stsp err = unlockerr;
7749 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7751 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7752 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7753 8b692cd0 2019-10-21 stsp err = unlockerr;
7754 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7756 f259c4c1 2021-09-24 stsp return err;
7759 f259c4c1 2021-09-24 stsp const struct got_error *
7760 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7761 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7763 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7764 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7766 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7768 f259c4c1 2021-09-24 stsp goto done;
7770 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7772 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7773 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7774 f259c4c1 2021-09-24 stsp err = sync_err;
7776 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7777 f259c4c1 2021-09-24 stsp free(fileindex_path);
7778 8b692cd0 2019-10-21 stsp return err;
7781 f259c4c1 2021-09-24 stsp static const struct got_error *
7782 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7784 f259c4c1 2021-09-24 stsp const struct got_error *err;
7785 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7787 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7789 f259c4c1 2021-09-24 stsp goto done;
7790 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7792 f259c4c1 2021-09-24 stsp goto done;
7794 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7796 f259c4c1 2021-09-24 stsp goto done;
7797 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7799 f259c4c1 2021-09-24 stsp goto done;
7802 f259c4c1 2021-09-24 stsp free(branch_refname);
7803 f259c4c1 2021-09-24 stsp free(commit_refname);
7804 f259c4c1 2021-09-24 stsp return err;
7807 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7808 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7809 f259c4c1 2021-09-24 stsp const char *branch_name;
7812 f259c4c1 2021-09-24 stsp static const struct got_error *
7813 2a47b1e5 2022-11-01 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7814 2a47b1e5 2022-11-01 stsp const char *diff_path, char **logmsg, void *arg)
7816 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7818 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7819 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7820 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7822 f259c4c1 2021-09-24 stsp return NULL;
7826 f259c4c1 2021-09-24 stsp const struct got_error *
7827 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7828 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7829 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7830 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7831 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7832 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7834 f259c4c1 2021-09-24 stsp const struct got_error *err;
7835 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7837 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7839 f259c4c1 2021-09-24 stsp goto done;
7841 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7842 f259c4c1 2021-09-24 stsp worktree);
7844 f259c4c1 2021-09-24 stsp goto done;
7846 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7847 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7848 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7850 f259c4c1 2021-09-24 stsp free(fileindex_path);
7851 f259c4c1 2021-09-24 stsp return err;
7854 f259c4c1 2021-09-24 stsp const struct got_error *
7855 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7856 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7857 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7858 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7859 0ff8d236 2021-09-28 stsp struct got_repository *repo,
7860 0ff8d236 2021-09-28 stsp got_worktree_status_cb status_cb, void *status_arg)
7863 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7864 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7865 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7866 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7867 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7868 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7869 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7870 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7871 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7873 2a47b1e5 2022-11-01 stsp memset(&cc_arg, 0, sizeof(cc_arg));
7874 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7876 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7878 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7880 f259c4c1 2021-09-24 stsp goto done;
7882 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7884 f259c4c1 2021-09-24 stsp goto done;
7886 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7888 f259c4c1 2021-09-24 stsp goto done;
7890 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7891 f259c4c1 2021-09-24 stsp &have_staged_files);
7892 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7893 f259c4c1 2021-09-24 stsp goto done;
7894 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7895 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7896 f259c4c1 2021-09-24 stsp goto done;
7899 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7900 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7901 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7902 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7903 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7904 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7905 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7906 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7908 f259c4c1 2021-09-24 stsp goto done;
7910 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7911 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7912 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7913 f259c4c1 2021-09-24 stsp goto done;
7916 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7917 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7918 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
7920 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
7921 f259c4c1 2021-09-24 stsp ct_path++;
7922 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
7923 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7924 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7926 f259c4c1 2021-09-24 stsp goto done;
7930 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
7931 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
7932 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
7933 2a47b1e5 2022-11-01 stsp head_commit_id, branch_tip, worktree, author, committer, NULL,
7934 0ff8d236 2021-09-28 stsp merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7936 f259c4c1 2021-09-24 stsp goto done;
7938 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
7939 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
7940 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7941 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7942 f259c4c1 2021-09-24 stsp err = sync_err;
7944 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7945 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7946 f259c4c1 2021-09-24 stsp free_commitable(ct);
7948 f259c4c1 2021-09-24 stsp got_pathlist_free(&commitable_paths);
7949 f259c4c1 2021-09-24 stsp free(fileindex_path);
7950 f259c4c1 2021-09-24 stsp return err;
7953 f259c4c1 2021-09-24 stsp const struct got_error *
7954 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
7955 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
7957 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7958 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7960 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7962 f259c4c1 2021-09-24 stsp goto done;
7964 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7966 f259c4c1 2021-09-24 stsp goto done;
7967 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7968 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7969 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7970 f259c4c1 2021-09-24 stsp err = sync_err;
7972 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7973 f259c4c1 2021-09-24 stsp free(fileindex_path);
7974 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7975 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7976 f259c4c1 2021-09-24 stsp err = unlockerr;
7977 f259c4c1 2021-09-24 stsp return err;
7980 f259c4c1 2021-09-24 stsp const struct got_error *
7981 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7982 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7984 f259c4c1 2021-09-24 stsp const struct got_error *err;
7985 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
7986 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
7988 f259c4c1 2021-09-24 stsp *in_progress = 0;
7990 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7992 f259c4c1 2021-09-24 stsp return err;
7993 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7994 793fcac3 2021-09-24 stsp free(branch_refname);
7995 f259c4c1 2021-09-24 stsp if (err) {
7996 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
7997 f259c4c1 2021-09-24 stsp return err;
7999 f259c4c1 2021-09-24 stsp *in_progress = 1;
8001 f259c4c1 2021-09-24 stsp return NULL;
8004 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
8005 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
8006 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
8008 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
8009 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8010 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
8011 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8012 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
8013 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8014 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
8016 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8018 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8020 f259c4c1 2021-09-24 stsp return err;
8022 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8024 f259c4c1 2021-09-24 stsp goto done;
8026 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
8027 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
8028 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
8029 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8032 f259c4c1 2021-09-24 stsp goto done;
8034 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8036 f259c4c1 2021-09-24 stsp return err;
8038 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8040 f259c4c1 2021-09-24 stsp return err;
8042 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8045 f259c4c1 2021-09-24 stsp goto done;
8047 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8049 f259c4c1 2021-09-24 stsp goto done;
8051 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8052 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8053 f259c4c1 2021-09-24 stsp goto done;
8056 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
8058 f259c4c1 2021-09-24 stsp goto done;
8060 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8062 f259c4c1 2021-09-24 stsp goto done;
8063 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
8065 f259c4c1 2021-09-24 stsp goto done;
8067 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8069 f259c4c1 2021-09-24 stsp goto done;
8070 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
8072 f259c4c1 2021-09-24 stsp goto done;
8075 f259c4c1 2021-09-24 stsp free(branch_refname);
8076 f259c4c1 2021-09-24 stsp free(commit_refname);
8077 f259c4c1 2021-09-24 stsp free(fileindex_path);
8078 f259c4c1 2021-09-24 stsp if (branch_ref)
8079 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8080 f259c4c1 2021-09-24 stsp if (commit_ref)
8081 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8082 f259c4c1 2021-09-24 stsp if (wt_branch)
8083 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
8084 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
8085 f259c4c1 2021-09-24 stsp if (err) {
8086 f259c4c1 2021-09-24 stsp if (*fileindex) {
8087 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8088 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8090 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8092 f259c4c1 2021-09-24 stsp return err;
8095 f259c4c1 2021-09-24 stsp const struct got_error *
8096 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
8097 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8098 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
8100 f259c4c1 2021-09-24 stsp const struct got_error *err;
8101 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
8102 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8103 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8104 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
8106 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8107 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8108 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8110 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
8112 f259c4c1 2021-09-24 stsp return err;
8114 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
8116 f259c4c1 2021-09-24 stsp goto done;
8118 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8119 f259c4c1 2021-09-24 stsp &have_staged_files);
8120 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
8121 f259c4c1 2021-09-24 stsp goto done;
8122 f259c4c1 2021-09-24 stsp if (have_staged_files) {
8123 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
8124 f259c4c1 2021-09-24 stsp goto done;
8127 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
8129 f259c4c1 2021-09-24 stsp goto done;
8131 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
8133 f259c4c1 2021-09-24 stsp goto done;
8135 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8137 f259c4c1 2021-09-24 stsp goto done;
8139 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
8140 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8141 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
8142 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
8143 f259c4c1 2021-09-24 stsp goto done;
8145 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8146 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
8147 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
8148 f259c4c1 2021-09-24 stsp goto done;
8151 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8153 f259c4c1 2021-09-24 stsp goto done;
8155 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
8157 f259c4c1 2021-09-24 stsp goto done;
8159 f259c4c1 2021-09-24 stsp free(commit_refname);
8160 f259c4c1 2021-09-24 stsp free(branch_refname);
8161 f259c4c1 2021-09-24 stsp free(fileindex_path);
8162 f259c4c1 2021-09-24 stsp if (commit_ref)
8163 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
8164 f259c4c1 2021-09-24 stsp if (branch_ref)
8165 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
8166 f259c4c1 2021-09-24 stsp if (err) {
8167 f259c4c1 2021-09-24 stsp if (*branch_name) {
8168 f259c4c1 2021-09-24 stsp free(*branch_name);
8169 f259c4c1 2021-09-24 stsp *branch_name = NULL;
8171 f259c4c1 2021-09-24 stsp free(*branch_tip);
8172 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
8173 f259c4c1 2021-09-24 stsp if (*fileindex) {
8174 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
8175 f259c4c1 2021-09-24 stsp *fileindex = NULL;
8177 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
8179 f259c4c1 2021-09-24 stsp return err;
8182 f259c4c1 2021-09-24 stsp const struct got_error *
8183 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
8184 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
8185 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8187 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
8188 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
8189 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
8190 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
8191 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
8192 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
8194 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, repo,
8195 a44927cc 2022-04-07 stsp worktree->base_commit_id);
8197 a44927cc 2022-04-07 stsp goto done;
8199 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, repo, commit,
8200 a44927cc 2022-04-07 stsp worktree->path_prefix);
8202 f259c4c1 2021-09-24 stsp goto done;
8204 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
8206 f259c4c1 2021-09-24 stsp goto done;
8208 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
8210 f259c4c1 2021-09-24 stsp goto done;
8212 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
8213 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
8214 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
8215 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
8216 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
8217 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
8218 f259c4c1 2021-09-24 stsp rfa.repo = repo;
8219 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
8220 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
8221 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
8223 f259c4c1 2021-09-24 stsp goto sync;
8225 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8226 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
8228 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8229 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
8230 f259c4c1 2021-09-24 stsp err = sync_err;
8232 f259c4c1 2021-09-24 stsp free(tree_id);
8233 f259c4c1 2021-09-24 stsp free(commit_id);
8234 a44927cc 2022-04-07 stsp if (commit)
8235 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
8236 f259c4c1 2021-09-24 stsp if (fileindex)
8237 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
8238 f259c4c1 2021-09-24 stsp free(fileindex_path);
8240 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8241 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
8242 f259c4c1 2021-09-24 stsp err = unlockerr;
8243 f259c4c1 2021-09-24 stsp return err;
8246 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
8247 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
8248 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8249 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8250 2db2652d 2019-08-07 stsp struct got_repository *repo;
8251 2db2652d 2019-08-07 stsp int have_changes;
8254 336075a4 2022-06-25 op static const struct got_error *
8255 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
8256 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8257 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8258 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8260 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
8261 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
8262 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
8263 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
8264 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
8265 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
8267 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
8268 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
8269 8b13ce36 2019-08-08 stsp return NULL;
8270 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
8271 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
8273 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8274 735ef5ac 2019-08-03 stsp if (ie == NULL)
8275 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8277 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8278 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8279 735ef5ac 2019-08-03 stsp relpath) == -1)
8280 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
8282 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
8283 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
8284 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8285 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
8288 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
8289 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8290 3aa5969e 2019-08-06 stsp goto done;
8291 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
8292 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
8293 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
8294 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8295 735ef5ac 2019-08-03 stsp goto done;
8298 2db2652d 2019-08-07 stsp a->have_changes = 1;
8300 735ef5ac 2019-08-03 stsp p = in_repo_path;
8301 735ef5ac 2019-08-03 stsp while (p[0] == '/')
8303 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
8304 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
8305 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
8307 735ef5ac 2019-08-03 stsp free(in_repo_path);
8308 dc424a06 2019-08-07 stsp return err;
8311 2db2652d 2019-08-07 stsp struct stage_path_arg {
8312 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8313 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8314 2db2652d 2019-08-07 stsp struct got_repository *repo;
8315 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
8316 2db2652d 2019-08-07 stsp void *status_arg;
8317 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
8318 2db2652d 2019-08-07 stsp void *patch_arg;
8319 7b5dc508 2019-10-28 stsp int staged_something;
8320 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
8323 2db2652d 2019-08-07 stsp static const struct got_error *
8324 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
8325 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8326 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8327 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8329 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8330 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8331 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8332 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8333 0cb83759 2019-08-03 stsp uint32_t stage;
8334 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8335 0aeb8099 2020-07-23 stsp struct stat sb;
8337 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8338 8b13ce36 2019-08-08 stsp return NULL;
8340 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8341 d3e7c587 2019-08-03 stsp if (ie == NULL)
8342 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8344 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8345 2db2652d 2019-08-07 stsp relpath)== -1)
8346 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8348 0cb83759 2019-08-03 stsp switch (status) {
8349 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8350 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8351 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8352 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8353 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8356 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8357 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8358 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8359 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8360 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8363 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8366 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8367 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8368 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8369 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8370 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8374 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8375 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8378 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8379 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8380 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8381 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8383 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8384 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8385 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8386 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8387 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8388 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8389 35213c7c 2020-07-23 stsp ssize_t target_len;
8390 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8391 35213c7c 2020-07-23 stsp sizeof(target_path));
8392 35213c7c 2020-07-23 stsp if (target_len == -1) {
8393 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8394 35213c7c 2020-07-23 stsp ondisk_path);
8397 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8398 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8399 35213c7c 2020-07-23 stsp a->worktree->root_path);
8402 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8403 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8404 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8408 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8409 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8410 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8412 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8413 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8415 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8416 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8418 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8419 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8421 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8422 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8423 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8427 9fdde394 2022-06-04 op * When staging the reverse of the staged diff,
8428 9fdde394 2022-06-04 op * implicitly unstage the file.
8430 9fdde394 2022-06-04 op if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8431 9fdde394 2022-06-04 op sizeof(ie->blob_sha1)) == 0) {
8432 9fdde394 2022-06-04 op got_fileindex_entry_stage_set(ie,
8433 9fdde394 2022-06-04 op GOT_FILEIDX_STAGE_NONE);
8436 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8437 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8439 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8440 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8441 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8442 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8445 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8447 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8448 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8452 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8453 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8454 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8455 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8457 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8458 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8461 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8463 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8464 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8466 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8467 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8470 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8474 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8475 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8476 dc424a06 2019-08-07 stsp free(path_content);
8477 2db2652d 2019-08-07 stsp free(ondisk_path);
8478 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8479 0ebf8283 2019-07-24 stsp return err;
8482 0cb83759 2019-08-03 stsp const struct got_error *
8483 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8484 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8485 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8486 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8487 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8489 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8490 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8491 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8492 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8493 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8494 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8495 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8496 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8498 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8500 0cb83759 2019-08-03 stsp return err;
8502 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8503 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8505 735ef5ac 2019-08-03 stsp goto done;
8506 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8508 735ef5ac 2019-08-03 stsp goto done;
8509 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8511 0cb83759 2019-08-03 stsp goto done;
8513 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8514 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8515 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8516 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8517 2db2652d 2019-08-07 stsp oka.repo = repo;
8518 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8519 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8520 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8521 62da3196 2021-10-01 stsp check_stage_ok, &oka, NULL, NULL, 1, 0);
8523 735ef5ac 2019-08-03 stsp goto done;
8525 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8526 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8527 2db2652d 2019-08-07 stsp goto done;
8530 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8531 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8532 2db2652d 2019-08-07 stsp spa.repo = repo;
8533 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8534 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8535 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8536 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8537 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8538 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8539 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8540 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8541 62da3196 2021-10-01 stsp stage_path, &spa, NULL, NULL, 1, 0);
8543 2db2652d 2019-08-07 stsp goto done;
8545 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8546 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8547 7b5dc508 2019-10-28 stsp goto done;
8550 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8551 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8552 0cb83759 2019-08-03 stsp err = sync_err;
8554 735ef5ac 2019-08-03 stsp if (head_ref)
8555 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8556 735ef5ac 2019-08-03 stsp free(head_commit_id);
8557 0cb83759 2019-08-03 stsp free(fileindex_path);
8558 0cb83759 2019-08-03 stsp if (fileindex)
8559 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8560 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8561 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8562 0cb83759 2019-08-03 stsp err = unlockerr;
8563 0cb83759 2019-08-03 stsp return err;
8566 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8567 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8568 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8569 ad493afc 2019-08-03 stsp struct got_repository *repo;
8570 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8571 ad493afc 2019-08-03 stsp void *progress_arg;
8572 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8573 2e1f37b0 2019-08-08 stsp void *patch_arg;
8576 2e1f37b0 2019-08-08 stsp static const struct got_error *
8577 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8578 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8579 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8580 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8581 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8583 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8584 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8585 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8586 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8587 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8588 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8589 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8590 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8592 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8593 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8595 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8597 2e1f37b0 2019-08-08 stsp return err;
8599 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
8600 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
8601 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8602 eb81bc23 2022-06-28 tracey goto done;
8604 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
8605 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
8606 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8607 eb81bc23 2022-06-28 tracey goto done;
8610 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8612 2e1f37b0 2019-08-08 stsp goto done;
8614 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8616 2e1f37b0 2019-08-08 stsp goto done;
8618 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8620 2e1f37b0 2019-08-08 stsp goto done;
8622 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8625 2e1f37b0 2019-08-08 stsp goto done;
8627 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8629 2e1f37b0 2019-08-08 stsp goto done;
8631 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8633 2e1f37b0 2019-08-08 stsp goto done;
8635 49d4a017 2022-06-30 stsp err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8636 4b752015 2022-06-30 stsp path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8638 2e1f37b0 2019-08-08 stsp goto done;
8640 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8641 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8643 2e1f37b0 2019-08-08 stsp goto done;
8644 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8645 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8647 2e1f37b0 2019-08-08 stsp goto done;
8649 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8650 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8651 2e1f37b0 2019-08-08 stsp goto done;
8653 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8654 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8655 2e1f37b0 2019-08-08 stsp goto done;
8657 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8658 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8659 eb81bc23 2022-06-28 tracey struct diff_chunk_context cc = {};
8660 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8661 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8662 fe621944 2020-11-10 stsp nchanges++;
8664 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8665 2e1f37b0 2019-08-08 stsp int choice;
8666 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8667 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8668 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8669 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8671 2e1f37b0 2019-08-08 stsp goto done;
8672 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8673 2e1f37b0 2019-08-08 stsp have_content = 1;
8675 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8676 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8679 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8680 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8681 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8683 2e1f37b0 2019-08-08 stsp free(label1);
8684 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8685 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8687 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8688 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8689 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
8690 2e1f37b0 2019-08-08 stsp if (staged_blob)
8691 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8692 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8693 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8694 fe621944 2020-11-10 stsp err = free_err;
8695 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8696 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8697 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8698 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8699 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8700 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8701 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8702 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8703 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8704 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8705 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8706 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8707 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8708 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8709 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8710 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8711 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8712 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8713 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8715 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8716 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8717 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8718 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8719 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8720 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8721 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8723 2e1f37b0 2019-08-08 stsp free(path1);
8724 2e1f37b0 2019-08-08 stsp free(path2);
8725 fda8017d 2020-07-23 stsp return err;
8728 fda8017d 2020-07-23 stsp static const struct got_error *
8729 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8730 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8731 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8732 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8733 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8734 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8735 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8737 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8738 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8739 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8740 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8741 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8742 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8743 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8744 fda8017d 2020-07-23 stsp struct stat sb;
8746 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8747 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8748 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8750 fda8017d 2020-07-23 stsp return err;
8752 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8753 fda8017d 2020-07-23 stsp return NULL;
8755 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8756 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8757 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8759 fda8017d 2020-07-23 stsp goto done;
8762 00fe21f2 2021-12-31 stsp f = fopen(path_unstaged_content, "re");
8763 fda8017d 2020-07-23 stsp if (f == NULL) {
8764 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8765 fda8017d 2020-07-23 stsp path_unstaged_content);
8766 fda8017d 2020-07-23 stsp goto done;
8768 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8769 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8770 fda8017d 2020-07-23 stsp goto done;
8772 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8773 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8774 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8776 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8777 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8778 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8779 fda8017d 2020-07-23 stsp goto done;
8781 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8782 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8783 fda8017d 2020-07-23 stsp goto done;
8785 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8786 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8787 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8788 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8789 fda8017d 2020-07-23 stsp progress_arg);
8791 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8793 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8795 67a66647 2021-05-31 stsp return err;
8797 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8798 67a66647 2021-05-31 stsp parent) == -1) {
8799 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8800 67a66647 2021-05-31 stsp base_path = NULL;
8801 67a66647 2021-05-31 stsp goto done;
8804 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8806 67a66647 2021-05-31 stsp goto done;
8807 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8808 67a66647 2021-05-31 stsp blob_base);
8810 67a66647 2021-05-31 stsp goto done;
8813 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8814 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8816 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8817 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8818 eec2f5a9 2021-06-03 stsp ondisk_path);
8820 eec2f5a9 2021-06-03 stsp goto done;
8823 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path,
8824 8bd0cdad 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8825 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8826 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8827 eec2f5a9 2021-06-03 stsp goto done;
8829 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8830 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8831 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8832 eec2f5a9 2021-06-03 stsp close(fd);
8833 eec2f5a9 2021-06-03 stsp goto done;
8837 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8838 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8839 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8840 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8841 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8844 fda8017d 2020-07-23 stsp goto done;
8846 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8847 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8848 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8850 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8851 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8854 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8855 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8856 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8857 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8858 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8859 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8860 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8861 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8862 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8863 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8864 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8865 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8866 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8867 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8868 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8869 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8870 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8871 67a66647 2021-05-31 stsp free(blob_base_path);
8872 67a66647 2021-05-31 stsp free(parent);
8873 67a66647 2021-05-31 stsp free(base_path);
8874 2e1f37b0 2019-08-08 stsp return err;
8877 ad493afc 2019-08-03 stsp static const struct got_error *
8878 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8879 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8880 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8881 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8883 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8884 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8885 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8886 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8887 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8888 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8889 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8890 9bc94a15 2019-08-03 stsp struct stat sb;
8891 eb81bc23 2022-06-28 tracey int fd1 = -1, fd2 = -1;
8893 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8894 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8895 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8896 2e1f37b0 2019-08-08 stsp return NULL;
8898 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8899 ad493afc 2019-08-03 stsp if (ie == NULL)
8900 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8902 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8904 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8906 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8907 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8909 f69721c3 2019-10-21 stsp goto done;
8910 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8911 f69721c3 2019-10-21 stsp id_str) == -1) {
8912 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8913 eb81bc23 2022-06-28 tracey goto done;
8916 eb81bc23 2022-06-28 tracey fd1 = got_opentempfd();
8917 eb81bc23 2022-06-28 tracey if (fd1 == -1) {
8918 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8919 eb81bc23 2022-06-28 tracey goto done;
8921 eb81bc23 2022-06-28 tracey fd2 = got_opentempfd();
8922 eb81bc23 2022-06-28 tracey if (fd2 == -1) {
8923 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
8924 f69721c3 2019-10-21 stsp goto done;
8927 ad493afc 2019-08-03 stsp switch (staged_status) {
8928 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8929 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8930 eb81bc23 2022-06-28 tracey blob_id, 8192, fd1);
8933 ad493afc 2019-08-03 stsp /* fall through */
8934 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8935 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8936 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8937 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8938 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8939 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8942 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8945 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8946 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8947 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8948 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8949 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8950 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8953 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8954 eb81bc23 2022-06-28 tracey staged_blob_id, 8192, fd2);
8957 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8958 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8959 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8960 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8961 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8962 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8963 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8964 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8965 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8967 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8968 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8969 36bf999c 2020-07-23 stsp char *staged_target;
8970 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8971 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8973 36bf999c 2020-07-23 stsp goto done;
8974 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8975 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8976 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8977 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8978 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8979 36bf999c 2020-07-23 stsp free(staged_target);
8981 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8982 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8983 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8984 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8985 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8986 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8987 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8991 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8994 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8995 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8996 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8997 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9000 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
9001 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
9002 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
9003 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
9004 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9007 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
9009 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
9010 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
9014 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9015 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9016 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
9017 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
9020 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
9024 ad493afc 2019-08-03 stsp free(ondisk_path);
9025 eb81bc23 2022-06-28 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9026 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9027 ad493afc 2019-08-03 stsp if (blob_base)
9028 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
9029 eb81bc23 2022-06-28 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9030 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
9031 ad493afc 2019-08-03 stsp if (blob_staged)
9032 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
9033 f69721c3 2019-10-21 stsp free(id_str);
9034 f69721c3 2019-10-21 stsp free(label_orig);
9035 ad493afc 2019-08-03 stsp return err;
9038 ad493afc 2019-08-03 stsp const struct got_error *
9039 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
9040 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
9041 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
9042 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
9043 ad493afc 2019-08-03 stsp struct got_repository *repo)
9045 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
9046 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9047 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
9048 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
9049 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
9051 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
9053 ad493afc 2019-08-03 stsp return err;
9055 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9057 ad493afc 2019-08-03 stsp goto done;
9059 ad493afc 2019-08-03 stsp upa.worktree = worktree;
9060 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
9061 ad493afc 2019-08-03 stsp upa.repo = repo;
9062 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
9063 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
9064 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
9065 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
9066 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
9067 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
9068 62da3196 2021-10-01 stsp unstage_path, &upa, NULL, NULL, 1, 0);
9070 ad493afc 2019-08-03 stsp goto done;
9073 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
9074 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
9075 ad493afc 2019-08-03 stsp err = sync_err;
9077 ad493afc 2019-08-03 stsp free(fileindex_path);
9078 ad493afc 2019-08-03 stsp if (fileindex)
9079 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
9080 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
9081 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
9082 ad493afc 2019-08-03 stsp err = unlockerr;
9083 ad493afc 2019-08-03 stsp return err;
9086 b2118c49 2020-07-28 stsp struct report_file_info_arg {
9087 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
9088 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
9089 b2118c49 2020-07-28 stsp void *info_arg;
9090 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
9091 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
9092 b2118c49 2020-07-28 stsp void *cancel_arg;
9095 b2118c49 2020-07-28 stsp static const struct got_error *
9096 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
9098 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
9099 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9100 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
9101 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9102 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
9103 b2118c49 2020-07-28 stsp int stage;
9105 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9106 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
9108 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
9109 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9110 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
9113 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
9114 b2118c49 2020-07-28 stsp return NULL;
9116 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
9117 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
9118 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
9120 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
9121 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9122 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
9123 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
9124 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
9125 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
9128 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
9129 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
9130 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
9133 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9134 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9137 b2118c49 2020-07-28 stsp const struct got_error *
9138 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
9139 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
9140 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
9141 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
9144 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
9145 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
9146 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
9147 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
9149 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
9151 b2118c49 2020-07-28 stsp return err;
9153 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9155 b2118c49 2020-07-28 stsp goto done;
9157 b2118c49 2020-07-28 stsp arg.worktree = worktree;
9158 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
9159 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
9160 b2118c49 2020-07-28 stsp arg.paths = paths;
9161 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
9162 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
9163 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9166 b2118c49 2020-07-28 stsp free(fileindex_path);
9167 b2118c49 2020-07-28 stsp if (fileindex)
9168 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
9169 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
9170 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
9171 b2118c49 2020-07-28 stsp err = unlockerr;
9172 b2118c49 2020-07-28 stsp return err;
9175 78f5ac24 2022-03-19 op static const struct got_error *
9176 78f5ac24 2022-03-19 op patch_check_path(const char *p, char **path, unsigned char *status,
9177 78f5ac24 2022-03-19 op unsigned char *staged_status, struct got_fileindex *fileindex,
9178 78f5ac24 2022-03-19 op struct got_worktree *worktree, struct got_repository *repo)
9180 78f5ac24 2022-03-19 op const struct got_error *err;
9181 78f5ac24 2022-03-19 op struct got_fileindex_entry *ie;
9182 78f5ac24 2022-03-19 op struct stat sb;
9183 78f5ac24 2022-03-19 op char *ondisk_path = NULL;
9185 78f5ac24 2022-03-19 op err = got_worktree_resolve_path(path, worktree, p);
9189 78f5ac24 2022-03-19 op if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9190 78f5ac24 2022-03-19 op *path[0] ? "/" : "", *path) == -1)
9191 78f5ac24 2022-03-19 op return got_error_from_errno("asprintf");
9193 78f5ac24 2022-03-19 op ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9195 78f5ac24 2022-03-19 op *staged_status = get_staged_status(ie);
9196 a05fb460 2022-04-23 op err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9201 78f5ac24 2022-03-19 op *staged_status = GOT_STATUS_NO_CHANGE;
9202 78f5ac24 2022-03-19 op *status = GOT_STATUS_UNVERSIONED;
9203 78f5ac24 2022-03-19 op if (lstat(ondisk_path, &sb) == -1) {
9204 78f5ac24 2022-03-19 op if (errno != ENOENT) {
9205 78f5ac24 2022-03-19 op err = got_error_from_errno2("lstat",
9206 78f5ac24 2022-03-19 op ondisk_path);
9209 78f5ac24 2022-03-19 op *status = GOT_STATUS_NONEXISTENT;
9214 78f5ac24 2022-03-19 op free(ondisk_path);
9218 78f5ac24 2022-03-19 op static const struct got_error *
9219 78f5ac24 2022-03-19 op patch_can_rm(const char *path, unsigned char status,
9220 78f5ac24 2022-03-19 op unsigned char staged_status)
9222 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9223 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9224 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9225 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9226 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY &&
9227 78f5ac24 2022-03-19 op status != GOT_STATUS_MODE_CHANGE)
9228 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9229 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9230 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9231 78f5ac24 2022-03-19 op return NULL;
9234 78f5ac24 2022-03-19 op static const struct got_error *
9235 78f5ac24 2022-03-19 op patch_can_add(const char *path, unsigned char status)
9237 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NONEXISTENT)
9238 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9239 78f5ac24 2022-03-19 op return NULL;
9242 78f5ac24 2022-03-19 op static const struct got_error *
9243 78f5ac24 2022-03-19 op patch_can_edit(const char *path, unsigned char status,
9244 78f5ac24 2022-03-19 op unsigned char staged_status)
9246 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
9247 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
9248 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
9249 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
9250 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY)
9251 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9252 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
9253 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
9254 78f5ac24 2022-03-19 op return NULL;
9257 78f5ac24 2022-03-19 op const struct got_error *
9258 78f5ac24 2022-03-19 op got_worktree_patch_prepare(struct got_fileindex **fileindex,
9259 f2dd7807 2022-05-17 op char **fileindex_path, struct got_worktree *worktree)
9261 f2dd7807 2022-05-17 op return open_fileindex(fileindex, fileindex_path, worktree);
9264 78f5ac24 2022-03-19 op const struct got_error *
9265 78f5ac24 2022-03-19 op got_worktree_patch_check_path(const char *old, const char *new,
9266 78f5ac24 2022-03-19 op char **oldpath, char **newpath, struct got_worktree *worktree,
9267 78f5ac24 2022-03-19 op struct got_repository *repo, struct got_fileindex *fileindex)
9269 78f5ac24 2022-03-19 op const struct got_error *err = NULL;
9270 78f5ac24 2022-03-19 op int file_renamed = 0;
9271 78f5ac24 2022-03-19 op unsigned char status_old, staged_status_old;
9272 78f5ac24 2022-03-19 op unsigned char status_new, staged_status_new;
9274 78f5ac24 2022-03-19 op *oldpath = NULL;
9275 78f5ac24 2022-03-19 op *newpath = NULL;
9277 78f5ac24 2022-03-19 op err = patch_check_path(old != NULL ? old : new, oldpath,
9278 78f5ac24 2022-03-19 op &status_old, &staged_status_old, fileindex, worktree, repo);
9282 78f5ac24 2022-03-19 op err = patch_check_path(new != NULL ? new : old, newpath,
9283 78f5ac24 2022-03-19 op &status_new, &staged_status_new, fileindex, worktree, repo);
9287 78f5ac24 2022-03-19 op if (old != NULL && new != NULL && strcmp(old, new) != 0)
9288 78f5ac24 2022-03-19 op file_renamed = 1;
9290 78f5ac24 2022-03-19 op if (old != NULL && new == NULL)
9291 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9292 78f5ac24 2022-03-19 op else if (file_renamed) {
9293 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
9294 78f5ac24 2022-03-19 op if (err == NULL)
9295 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9296 78f5ac24 2022-03-19 op } else if (old == NULL)
9297 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
9299 78f5ac24 2022-03-19 op err = patch_can_edit(*newpath, status_new, staged_status_new);
9303 78f5ac24 2022-03-19 op free(*oldpath);
9304 78f5ac24 2022-03-19 op *oldpath = NULL;
9305 78f5ac24 2022-03-19 op free(*newpath);
9306 78f5ac24 2022-03-19 op *newpath = NULL;
9311 78f5ac24 2022-03-19 op const struct got_error *
9312 f2dd7807 2022-05-17 op got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9313 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9314 f2dd7807 2022-05-17 op got_worktree_checkout_cb progress_cb, void *progress_arg)
9316 f2dd7807 2022-05-17 op struct schedule_addition_args saa;
9318 f2dd7807 2022-05-17 op memset(&saa, 0, sizeof(saa));
9319 f2dd7807 2022-05-17 op saa.worktree = worktree;
9320 f2dd7807 2022-05-17 op saa.fileindex = fileindex;
9321 f2dd7807 2022-05-17 op saa.progress_cb = progress_cb;
9322 f2dd7807 2022-05-17 op saa.progress_arg = progress_arg;
9323 f2dd7807 2022-05-17 op saa.repo = repo;
9325 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9326 f2dd7807 2022-05-17 op schedule_addition, &saa, NULL, NULL, 1, 0);
9329 f2dd7807 2022-05-17 op const struct got_error *
9330 f2dd7807 2022-05-17 op got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9331 f2dd7807 2022-05-17 op struct got_worktree *worktree, struct got_fileindex *fileindex,
9332 f2dd7807 2022-05-17 op got_worktree_delete_cb progress_cb, void *progress_arg)
9334 f2dd7807 2022-05-17 op struct schedule_deletion_args sda;
9336 f2dd7807 2022-05-17 op memset(&sda, 0, sizeof(sda));
9337 f2dd7807 2022-05-17 op sda.worktree = worktree;
9338 f2dd7807 2022-05-17 op sda.fileindex = fileindex;
9339 f2dd7807 2022-05-17 op sda.progress_cb = progress_cb;
9340 f2dd7807 2022-05-17 op sda.progress_arg = progress_arg;
9341 f2dd7807 2022-05-17 op sda.repo = repo;
9342 f2dd7807 2022-05-17 op sda.delete_local_mods = 0;
9343 f2dd7807 2022-05-17 op sda.keep_on_disk = 0;
9344 f2dd7807 2022-05-17 op sda.ignore_missing_paths = 0;
9345 f2dd7807 2022-05-17 op sda.status_codes = NULL;
9347 f2dd7807 2022-05-17 op return worktree_status(worktree, path, fileindex, repo,
9348 f2dd7807 2022-05-17 op schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9351 f2dd7807 2022-05-17 op const struct got_error *
9352 f2dd7807 2022-05-17 op got_worktree_patch_complete(struct got_fileindex *fileindex,
9353 4bcdc895 2022-05-17 op const char *fileindex_path)
9355 f2dd7807 2022-05-17 op const struct got_error *err = NULL;
9357 4bcdc895 2022-05-17 op err = sync_fileindex(fileindex, fileindex_path);
9358 4bcdc895 2022-05-17 op got_fileindex_free(fileindex);
