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 8b925c6c 2022-07-16 thomas #include <sys/queue.h>
20 d1f6d47b 2019-02-04 stsp #include <dirent.h>
21 12ce7a6c 2019-08-12 stsp #include <limits.h>
22 f5c49f82 2019-01-06 stsp #include <stddef.h>
23 86c3caaf 2018-03-09 stsp #include <string.h>
24 86c3caaf 2018-03-09 stsp #include <stdio.h>
25 86c3caaf 2018-03-09 stsp #include <stdlib.h>
26 303e14b5 2019-09-23 stsp #include <time.h>
27 86c3caaf 2018-03-09 stsp #include <fcntl.h>
28 86c3caaf 2018-03-09 stsp #include <errno.h>
29 86c3caaf 2018-03-09 stsp #include <unistd.h>
30 9d31a1d8 2018-03-11 stsp #include <zlib.h>
31 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
32 512f0d0e 2019-01-02 stsp #include <libgen.h>
34 dd038bc6 2021-09-21 thomas.ad #include "got_compat.h"
36 86c3caaf 2018-03-09 stsp #include "got_error.h"
37 86c3caaf 2018-03-09 stsp #include "got_repository.h"
38 5261c201 2018-04-01 stsp #include "got_reference.h"
39 9d31a1d8 2018-03-11 stsp #include "got_object.h"
40 1dd54920 2019-05-11 stsp #include "got_path.h"
41 e6209546 2019-08-22 stsp #include "got_cancel.h"
42 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 234035bc 2019-06-01 stsp #include "got_diff.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
49 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
52 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
53 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
54 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
55 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
56 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
59 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
62 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
63 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
65 a2c162eb 2022-10-30 thomas static mode_t apply_umask(mode_t);
67 99724ed4 2018-03-10 stsp static const struct got_error *
68 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
70 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
73 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
74 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
76 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
81 507dc3bb 2018-12-29 stsp static const struct got_error *
82 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
84 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
85 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
86 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
87 507dc3bb 2018-12-29 stsp char *path = NULL;
89 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
91 507dc3bb 2018-12-29 stsp path = NULL;
95 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&tmppath, &tmpfile, path, "");
99 507dc3bb 2018-12-29 stsp if (content) {
100 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
101 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
102 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
107 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
108 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
109 2a57020b 2019-02-20 stsp unlink(tmppath);
114 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
115 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
116 230a42bd 2019-05-11 jcs free(tmppath);
117 09fe317a 2018-03-11 stsp return err;
120 024e9686 2019-05-14 stsp static const struct got_error *
121 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
123 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
124 024e9686 2019-05-14 stsp char *refstr = NULL;
126 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
127 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
128 024e9686 2019-05-14 stsp if (refstr == NULL)
129 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
131 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
132 024e9686 2019-05-14 stsp if (refstr == NULL)
133 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
135 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
136 024e9686 2019-05-14 stsp free(refstr);
137 024e9686 2019-05-14 stsp return err;
140 86c3caaf 2018-03-09 stsp const struct got_error *
141 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
142 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
144 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
145 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
146 ec22038e 2019-03-10 stsp uuid_t uuid;
147 ec22038e 2019-03-10 stsp uint32_t uuid_status;
148 65596e15 2018-12-24 stsp int obj_type;
149 7ac97322 2018-03-11 stsp char *path_got = NULL;
150 1451e70d 2018-03-10 stsp char *formatstr = NULL;
151 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
152 65596e15 2018-12-24 stsp char *basestr = NULL;
153 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
155 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
156 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
160 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
162 65596e15 2018-12-24 stsp return err;
163 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
165 65596e15 2018-12-24 stsp return err;
166 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
167 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
169 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
170 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
171 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
174 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
175 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
176 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
180 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
181 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
182 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
185 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
186 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
190 056e7441 2018-03-11 stsp /* Create an empty lock file. */
191 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
195 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
196 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
200 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
201 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
205 65596e15 2018-12-24 stsp /* Record our base commit. */
206 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
209 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
213 1451e70d 2018-03-10 stsp /* Store path to repository. */
214 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
215 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
219 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
220 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
221 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
225 ec22038e 2019-03-10 stsp /* Generate UUID. */
226 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
227 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
228 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
231 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
232 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
233 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
236 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
240 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
241 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
242 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
245 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
250 65596e15 2018-12-24 stsp free(commit_id);
251 7ac97322 2018-03-11 stsp free(path_got);
252 1451e70d 2018-03-10 stsp free(formatstr);
253 0bb8a95e 2018-03-12 stsp free(absprefix);
254 65596e15 2018-12-24 stsp free(basestr);
255 ec22038e 2019-03-10 stsp free(uuidstr);
256 86c3caaf 2018-03-09 stsp return err;
259 247140b2 2019-02-05 stsp const struct got_error *
260 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
261 e5dc7198 2018-12-29 stsp const char *path_prefix)
263 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
265 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
266 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
267 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
269 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
270 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
271 e5dc7198 2018-12-29 stsp free(absprefix);
272 e5dc7198 2018-12-29 stsp return NULL;
275 bc70eb79 2019-05-09 stsp const char *
276 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
278 36a38700 2019-05-10 stsp return worktree->head_ref_name;
281 024e9686 2019-05-14 stsp const struct got_error *
282 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
283 024e9686 2019-05-14 stsp struct got_reference *head_ref)
285 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
286 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
288 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
289 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
290 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
291 024e9686 2019-05-14 stsp path_got = NULL;
295 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
296 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
297 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
301 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
305 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
306 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
308 024e9686 2019-05-14 stsp free(path_got);
310 024e9686 2019-05-14 stsp free(head_ref_name);
311 024e9686 2019-05-14 stsp return err;
314 b72f483a 2019-02-05 stsp struct got_object_id *
315 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
317 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
320 507dc3bb 2018-12-29 stsp const struct got_error *
321 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
322 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
324 507dc3bb 2018-12-29 stsp const struct got_error *err;
325 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
326 507dc3bb 2018-12-29 stsp char *id_str = NULL;
327 507dc3bb 2018-12-29 stsp char *path_got = NULL;
329 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
330 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
331 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
332 507dc3bb 2018-12-29 stsp path_got = NULL;
336 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
338 507dc3bb 2018-12-29 stsp return err;
340 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
341 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
345 507dc3bb 2018-12-29 stsp /* Record our base commit. */
346 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
349 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
353 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
354 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
355 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
356 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
361 507dc3bb 2018-12-29 stsp got_object_close(obj);
362 507dc3bb 2018-12-29 stsp free(id_str);
363 507dc3bb 2018-12-29 stsp free(path_got);
364 507dc3bb 2018-12-29 stsp return err;
367 50b0790e 2020-09-11 stsp const struct got_gotconfig *
368 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
370 50b0790e 2020-09-11 stsp return worktree->gotconfig;
373 9d31a1d8 2018-03-11 stsp static const struct got_error *
374 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
376 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
377 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
378 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
379 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
380 86c3caaf 2018-03-09 stsp return NULL;
383 21908da4 2019-01-13 stsp static const struct got_error *
384 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
386 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
387 4a1ddfc2 2019-01-12 stsp char *abspath;
389 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
390 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
392 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
393 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
394 ddcd8544 2019-03-11 stsp struct stat sb;
395 ddcd8544 2019-03-11 stsp err = NULL;
396 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
397 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
398 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
399 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
400 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
403 4a1ddfc2 2019-01-12 stsp free(abspath);
404 68c76935 2019-02-19 stsp return err;
407 68c76935 2019-02-19 stsp static const struct got_error *
408 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
410 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
411 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
412 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
413 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
418 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
419 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
420 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
423 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
424 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
425 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
428 68c76935 2019-02-19 stsp if (flen1 == 0) {
429 68c76935 2019-02-19 stsp if (flen2 != 0)
432 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
433 68c76935 2019-02-19 stsp if (flen1 != 0)
436 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
437 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
447 68c76935 2019-02-19 stsp return err;
450 68c76935 2019-02-19 stsp static const struct got_error *
451 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
453 68c76935 2019-02-19 stsp struct stat sb;
454 68c76935 2019-02-19 stsp size_t size1, size2;
458 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
459 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
460 68c76935 2019-02-19 stsp size1 = sb.st_size;
462 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
463 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
464 68c76935 2019-02-19 stsp size2 = sb.st_size;
466 68c76935 2019-02-19 stsp if (size1 != size2) {
468 68c76935 2019-02-19 stsp return NULL;
471 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
472 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
473 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
474 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
476 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
479 24f136e0 2021-11-20 thomas static const struct got_error *
480 24f136e0 2021-11-20 thomas copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
482 24f136e0 2021-11-20 thomas uint8_t fbuf[65536];
483 24f136e0 2021-11-20 thomas size_t flen;
484 24f136e0 2021-11-20 thomas ssize_t outlen;
486 24f136e0 2021-11-20 thomas *outsize = 0;
488 24f136e0 2021-11-20 thomas if (fseek(f, 0L, SEEK_SET) == -1)
489 24f136e0 2021-11-20 thomas return got_ferror(f, GOT_ERR_IO);
491 24f136e0 2021-11-20 thomas for (;;) {
492 24f136e0 2021-11-20 thomas flen = fread(fbuf, 1, sizeof(fbuf), f);
493 24f136e0 2021-11-20 thomas if (flen == 0) {
494 24f136e0 2021-11-20 thomas if (ferror(f))
495 24f136e0 2021-11-20 thomas return got_error_from_errno("fread");
496 24f136e0 2021-11-20 thomas if (feof(f))
499 24f136e0 2021-11-20 thomas outlen = write(outfd, fbuf, flen);
500 24f136e0 2021-11-20 thomas if (outlen == -1)
501 24f136e0 2021-11-20 thomas return got_error_from_errno("write");
502 24f136e0 2021-11-20 thomas if (outlen != flen)
503 24f136e0 2021-11-20 thomas return got_error(GOT_ERR_IO);
504 24f136e0 2021-11-20 thomas *outsize += outlen;
507 24f136e0 2021-11-20 thomas return NULL;
510 24f136e0 2021-11-20 thomas static const struct got_error *
511 24f136e0 2021-11-20 thomas merge_binary_file(int *overlapcnt, int merged_fd,
512 24f136e0 2021-11-20 thomas FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
513 24f136e0 2021-11-20 thomas const char *label_deriv, const char *label_orig, const char *label_deriv2,
514 24f136e0 2021-11-20 thomas const char *ondisk_path)
516 24f136e0 2021-11-20 thomas const struct got_error *err = NULL;
517 24f136e0 2021-11-20 thomas int same_content, changed_deriv, changed_deriv2;
518 24f136e0 2021-11-20 thomas int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
519 24f136e0 2021-11-20 thomas off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
520 24f136e0 2021-11-20 thomas char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
521 24f136e0 2021-11-20 thomas char *base_path_orig = NULL, *base_path_deriv = NULL;
522 24f136e0 2021-11-20 thomas char *base_path_deriv2 = NULL;
524 24f136e0 2021-11-20 thomas *overlapcnt = 0;
526 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_deriv2);
528 24f136e0 2021-11-20 thomas return err;
530 24f136e0 2021-11-20 thomas if (same_content)
531 24f136e0 2021-11-20 thomas return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
533 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv, f_orig);
535 24f136e0 2021-11-20 thomas return err;
536 24f136e0 2021-11-20 thomas changed_deriv = !same_content;
537 24f136e0 2021-11-20 thomas err = check_files_equal(&same_content, f_deriv2, f_orig);
539 24f136e0 2021-11-20 thomas return err;
540 24f136e0 2021-11-20 thomas changed_deriv2 = !same_content;
542 24f136e0 2021-11-20 thomas if (changed_deriv && changed_deriv2) {
543 24f136e0 2021-11-20 thomas *overlapcnt = 1;
544 24f136e0 2021-11-20 thomas if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
545 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
546 24f136e0 2021-11-20 thomas goto done;
548 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
549 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
550 24f136e0 2021-11-20 thomas goto done;
552 24f136e0 2021-11-20 thomas if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
553 24f136e0 2021-11-20 thomas err = got_error_from_errno("asprintf");
554 24f136e0 2021-11-20 thomas goto done;
556 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_orig, &fd_orig,
557 fc2a50f2 2022-11-01 thomas base_path_orig, "");
559 24f136e0 2021-11-20 thomas goto done;
560 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
561 fc2a50f2 2022-11-01 thomas base_path_deriv, "");
563 24f136e0 2021-11-20 thomas goto done;
564 24f136e0 2021-11-20 thomas err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
565 fc2a50f2 2022-11-01 thomas base_path_deriv2, "");
567 24f136e0 2021-11-20 thomas goto done;
568 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
570 24f136e0 2021-11-20 thomas goto done;
571 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
573 24f136e0 2021-11-20 thomas goto done;
574 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
576 24f136e0 2021-11-20 thomas goto done;
577 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "Binary files differ and cannot be "
578 24f136e0 2021-11-20 thomas "merged automatically:\n") < 0) {
579 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
580 24f136e0 2021-11-20 thomas goto done;
582 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
583 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_BEGIN,
584 24f136e0 2021-11-20 thomas label_deriv ? " " : "",
585 24f136e0 2021-11-20 thomas label_deriv ? label_deriv : "",
586 24f136e0 2021-11-20 thomas path_deriv) < 0) {
587 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
588 24f136e0 2021-11-20 thomas goto done;
590 24f136e0 2021-11-20 thomas if (size_orig > 0) {
591 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
592 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_ORIG,
593 24f136e0 2021-11-20 thomas label_orig ? " " : "",
594 24f136e0 2021-11-20 thomas label_orig ? label_orig : "",
595 24f136e0 2021-11-20 thomas path_orig) < 0) {
596 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
597 24f136e0 2021-11-20 thomas goto done;
600 24f136e0 2021-11-20 thomas if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
601 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_SEP,
602 24f136e0 2021-11-20 thomas path_deriv2,
603 24f136e0 2021-11-20 thomas GOT_DIFF_CONFLICT_MARKER_END,
604 24f136e0 2021-11-20 thomas label_deriv2 ? " " : "",
605 24f136e0 2021-11-20 thomas label_deriv2 ? label_deriv2 : "") < 0) {
606 24f136e0 2021-11-20 thomas err = got_error_from_errno("dprintf");
607 24f136e0 2021-11-20 thomas goto done;
609 24f136e0 2021-11-20 thomas } else if (changed_deriv)
610 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
611 24f136e0 2021-11-20 thomas else if (changed_deriv2)
612 24f136e0 2021-11-20 thomas err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
614 24f136e0 2021-11-20 thomas if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
615 24f136e0 2021-11-20 thomas err == NULL)
616 24f136e0 2021-11-20 thomas err = got_error_from_errno2("unlink", path_orig);
617 24f136e0 2021-11-20 thomas if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
618 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_orig);
619 24f136e0 2021-11-20 thomas if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
620 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv);
621 24f136e0 2021-11-20 thomas if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
622 24f136e0 2021-11-20 thomas err = got_error_from_errno2("close", path_deriv2);
623 24f136e0 2021-11-20 thomas free(path_orig);
624 24f136e0 2021-11-20 thomas free(path_deriv);
625 24f136e0 2021-11-20 thomas free(path_deriv2);
626 24f136e0 2021-11-20 thomas free(base_path_orig);
627 24f136e0 2021-11-20 thomas free(base_path_deriv);
628 24f136e0 2021-11-20 thomas free(base_path_deriv2);
629 24f136e0 2021-11-20 thomas return err;
633 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
634 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
635 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
636 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
637 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
639 6353ad76 2019-02-08 stsp static const struct got_error *
640 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
641 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
642 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
643 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
644 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
645 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
647 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
648 6353ad76 2019-02-08 stsp int merged_fd = -1;
649 db590691 2021-06-02 stsp FILE *f_merged = NULL;
650 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
651 234035bc 2019-06-01 stsp int overlapcnt = 0;
652 3524bbf9 2020-10-20 stsp char *parent = NULL;
654 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
656 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
658 3524bbf9 2020-10-20 stsp return err;
660 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
661 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
665 fc2a50f2 2022-11-01 thomas err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
669 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
670 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
671 24f136e0 2021-11-20 thomas if (err) {
672 24f136e0 2021-11-20 thomas if (err->code != GOT_ERR_FILE_BINARY)
673 24f136e0 2021-11-20 thomas goto done;
674 24f136e0 2021-11-20 thomas err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
675 24f136e0 2021-11-20 thomas f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
676 24f136e0 2021-11-20 thomas ondisk_path);
678 24f136e0 2021-11-20 thomas goto done;
681 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
682 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
686 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
687 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
691 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
692 db590691 2021-06-02 stsp if (f_merged == NULL) {
693 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
696 db590691 2021-06-02 stsp merged_fd = -1;
698 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
699 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
700 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
706 a2c162eb 2022-10-30 thomas if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
707 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
711 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
712 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
713 230a42bd 2019-05-11 jcs ondisk_path);
718 fdcb7daf 2019-12-15 stsp if (merged_path)
719 fdcb7daf 2019-12-15 stsp unlink(merged_path);
721 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
722 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
723 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
724 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
725 6353ad76 2019-02-08 stsp free(merged_path);
726 af54ae4a 2019-02-19 stsp free(base_path);
727 3524bbf9 2020-10-20 stsp free(parent);
728 af57b12a 2020-07-23 stsp return err;
731 af57b12a 2020-07-23 stsp static const struct got_error *
732 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
733 af57b12a 2020-07-23 stsp size_t target_len)
735 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
736 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
737 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
738 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
739 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
740 af57b12a 2020-07-23 stsp ondisk_path);
741 af57b12a 2020-07-23 stsp return NULL;
745 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
746 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
747 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
748 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
750 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
751 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
753 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
754 993e2a1b 2020-07-23 stsp * has deleted this symlink.
756 11cc08c1 2020-07-23 stsp static const struct got_error *
757 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
758 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
759 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
761 11cc08c1 2020-07-23 stsp const struct got_error *err;
762 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
763 11cc08c1 2020-07-23 stsp FILE *f = NULL;
765 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
767 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
769 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
770 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
771 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
775 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
777 3818e3c4 2020-11-01 naddy goto done;
779 a2c162eb 2022-10-30 thomas if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
780 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
784 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
785 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
786 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
787 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
788 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
789 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
790 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
791 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
792 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
793 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
797 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
798 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
801 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
802 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
806 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
807 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
808 11cc08c1 2020-07-23 stsp free(path);
809 11cc08c1 2020-07-23 stsp free(id_str);
810 11cc08c1 2020-07-23 stsp free(label_deriv);
811 11cc08c1 2020-07-23 stsp return err;
814 d219f183 2020-07-23 stsp /* forward declaration */
815 d219f183 2020-07-23 stsp static const struct got_error *
816 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
817 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
818 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
819 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
822 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
823 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
824 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
825 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
827 af57b12a 2020-07-23 stsp static const struct got_error *
828 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
829 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
830 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
831 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
832 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
834 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
835 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
836 af57b12a 2020-07-23 stsp struct stat sb;
837 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
838 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
839 11cc08c1 2020-07-23 stsp int have_local_change = 0;
840 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
842 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
843 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
845 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
846 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
847 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
848 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
849 af57b12a 2020-07-23 stsp ondisk_path);
852 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
854 526a746f 2020-07-23 stsp if (blob_orig) {
855 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
860 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
861 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
862 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
863 11cc08c1 2020-07-23 stsp have_local_change = 1;
865 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
866 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
867 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
868 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
869 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
871 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
872 11cc08c1 2020-07-23 stsp if (ancestor_target) {
873 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
874 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
876 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
877 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
878 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
879 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
882 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
883 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
884 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
885 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
888 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
891 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
892 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
893 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
894 af57b12a 2020-07-23 stsp strlen(deriv_target));
897 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
898 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
899 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
900 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
901 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
902 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
905 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
906 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
907 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
910 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
916 af57b12a 2020-07-23 stsp free(ancestor_target);
917 eec2f5a9 2021-06-03 stsp return err;
920 eec2f5a9 2021-06-03 stsp static const struct got_error *
921 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
923 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
924 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
925 eec2f5a9 2021-06-03 stsp ssize_t target_len;
929 eec2f5a9 2021-06-03 stsp *outfile = NULL;
931 eec2f5a9 2021-06-03 stsp f = got_opentemp();
932 eec2f5a9 2021-06-03 stsp if (f == NULL)
933 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
934 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
935 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
936 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
939 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
940 eec2f5a9 2021-06-03 stsp if (n != target_len) {
941 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
944 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
945 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
948 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
949 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
956 eec2f5a9 2021-06-03 stsp *outfile = f;
957 14c901f1 2019-08-08 stsp return err;
961 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
962 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
963 14c901f1 2019-08-08 stsp * acts as the second derived version.
965 14c901f1 2019-08-08 stsp static const struct got_error *
966 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
967 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
968 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
969 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
970 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
971 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
973 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
974 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
975 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
976 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
977 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
979 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
981 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
983 ed6b5030 2020-10-20 stsp return err;
985 67a66647 2021-05-31 stsp if (blob_orig) {
986 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
987 67a66647 2021-05-31 stsp parent) == -1) {
988 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
989 67a66647 2021-05-31 stsp base_path = NULL;
993 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&blob_orig_path, &f_orig,
994 fc2a50f2 2022-11-01 thomas base_path, "");
997 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
998 67a66647 2021-05-31 stsp blob_orig);
1000 67a66647 2021-05-31 stsp goto done;
1001 67a66647 2021-05-31 stsp free(base_path);
1004 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1005 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1006 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1008 db590691 2021-06-02 stsp f_orig = got_opentemp();
1009 db590691 2021-06-02 stsp if (f_orig == NULL) {
1010 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1011 db590691 2021-06-02 stsp goto done;
1015 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1016 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1017 14c901f1 2019-08-08 stsp base_path = NULL;
1018 14c901f1 2019-08-08 stsp goto done;
1021 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1023 14c901f1 2019-08-08 stsp goto done;
1024 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1025 14c901f1 2019-08-08 stsp blob_deriv);
1027 14c901f1 2019-08-08 stsp goto done;
1029 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1031 14c901f1 2019-08-08 stsp goto done;
1032 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1033 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1034 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1035 14c901f1 2019-08-08 stsp goto done;
1039 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1040 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1042 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1043 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1045 eec2f5a9 2021-06-03 stsp goto done;
1048 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1049 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1050 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1051 eec2f5a9 2021-06-03 stsp goto done;
1053 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1054 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1055 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1056 eec2f5a9 2021-06-03 stsp close(fd);
1057 eec2f5a9 2021-06-03 stsp goto done;
1061 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1062 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1063 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1065 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1066 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1067 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1068 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1069 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1070 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1071 14c901f1 2019-08-08 stsp free(base_path);
1072 67a66647 2021-05-31 stsp if (blob_orig_path) {
1073 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1074 67a66647 2021-05-31 stsp free(blob_orig_path);
1076 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1077 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1078 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1080 6353ad76 2019-02-08 stsp free(id_str);
1081 818c7501 2019-07-11 stsp free(label_deriv);
1082 ed6b5030 2020-10-20 stsp free(parent);
1083 4a1ddfc2 2019-01-12 stsp return err;
1086 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1087 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1088 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1089 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1091 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1092 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1094 65b05cec 2020-07-23 stsp *new_iep = NULL;
1096 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1098 054041d0 2020-06-24 stsp return err;
1100 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1101 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1103 054041d0 2020-06-24 stsp goto done;
1105 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1108 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1110 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1111 13d9040b 2019-03-27 stsp return err;
1114 1ebedb77 2019-10-19 stsp static mode_t
1115 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1117 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1119 1ebedb77 2019-10-19 stsp if (executable) {
1120 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1121 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1122 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1123 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1124 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1125 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1128 a2c162eb 2022-10-30 thomas return st_mode;
1131 a2c162eb 2022-10-30 thomas static mode_t
1132 a2c162eb 2022-10-30 thomas apply_umask(mode_t mode)
1134 a2c162eb 2022-10-30 thomas mode_t um;
1136 a2c162eb 2022-10-30 thomas um = umask(000);
1137 a2c162eb 2022-10-30 thomas umask(um);
1138 a2c162eb 2022-10-30 thomas return mode & ~um;
1141 8ba819a3 2020-07-23 stsp /* forward declaration */
1142 13d9040b 2019-03-27 stsp static const struct got_error *
1143 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1144 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1145 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1146 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1147 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1148 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1151 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1152 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1154 8ba819a3 2020-07-23 stsp static const struct got_error *
1155 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1156 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1158 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1159 5a1fbc73 2020-07-23 stsp ssize_t elen;
1160 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1163 c6e8a826 2021-04-05 stsp *did_something = 0;
1166 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1167 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1168 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1169 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1170 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1171 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1173 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1174 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1175 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink())
1176 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1178 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1179 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1180 5a1fbc73 2020-07-23 stsp if (elen == -1)
1181 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1183 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1184 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1185 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1188 c6e8a826 2021-04-05 stsp *did_something = 1;
1189 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1190 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1191 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1192 5a1fbc73 2020-07-23 stsp return err;
1195 3c1ec782 2020-07-23 stsp static const struct got_error *
1196 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1197 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1199 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1200 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1201 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1203 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1205 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1206 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1207 3c1ec782 2020-07-23 stsp return NULL;
1211 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1212 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1213 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1214 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1215 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1217 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1218 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1219 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1221 ce031e9e 2020-10-20 stsp return err;
1222 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1223 ce031e9e 2020-10-20 stsp free(parent);
1224 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1226 ce031e9e 2020-10-20 stsp free(parent);
1227 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1228 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1229 3c1ec782 2020-07-23 stsp free(abspath);
1230 3c1ec782 2020-07-23 stsp return err;
1232 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1233 3c1ec782 2020-07-23 stsp free(abspath);
1235 3c1ec782 2020-07-23 stsp return err;
1237 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1239 3c1ec782 2020-07-23 stsp return err;
1242 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1243 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1244 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1245 3c1ec782 2020-07-23 stsp return NULL;
1248 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1249 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1250 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1251 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1252 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1253 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1255 3c1ec782 2020-07-23 stsp free(path_got);
1256 3c1ec782 2020-07-23 stsp return NULL;
1259 5a1fbc73 2020-07-23 stsp static const struct got_error *
1260 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1261 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1262 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1263 ace90326 2021-09-27 thomas int path_is_unversioned, int allow_bad_symlinks,
1264 ace90326 2021-09-27 thomas struct got_repository *repo,
1265 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1267 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1268 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1269 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1270 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1271 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1273 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1276 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1277 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1278 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1279 8ba819a3 2020-07-23 stsp * in the blob object.
1282 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1283 3521b466 2022-07-21 thomas if (err)
1284 3521b466 2022-07-21 thomas return err;
1286 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1287 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1288 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1289 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1290 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1291 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1292 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1293 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1294 3b9f0f87 2020-07-23 stsp progress_arg);
1296 8ba819a3 2020-07-23 stsp if (len > 0) {
1297 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1298 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1299 8ba819a3 2020-07-23 stsp len - hdrlen);
1300 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1301 8ba819a3 2020-07-23 stsp hdrlen = 0;
1303 8ba819a3 2020-07-23 stsp } while (len != 0);
1304 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1306 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1307 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1309 3c1ec782 2020-07-23 stsp return err;
1311 ace90326 2021-09-27 thomas if (*is_bad_symlink && !allow_bad_symlinks) {
1312 906c123b 2020-07-23 stsp /* install as a regular file */
1313 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1314 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1315 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1316 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1317 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1318 9e39ca77 2022-07-21 thomas return err;
1321 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1322 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1323 c6e8a826 2021-04-05 stsp int symlink_replaced;
1324 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1325 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1326 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1327 9e39ca77 2022-07-21 thomas return err;
1329 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1330 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1332 9e39ca77 2022-07-21 thomas return err;
1333 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1334 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1335 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1336 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1337 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1338 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1340 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1341 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1344 9e39ca77 2022-07-21 thomas return err; /* Nothing else to do. */
1347 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1348 f4994adc 2020-10-20 stsp char *parent;
1349 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1351 9e39ca77 2022-07-21 thomas return err;
1352 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1353 f4994adc 2020-10-20 stsp free(parent);
1355 9e39ca77 2022-07-21 thomas return err;
1357 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1358 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1360 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1361 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1362 9e39ca77 2022-07-21 thomas return err;
1366 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1367 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1368 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1369 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1370 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1371 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1372 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1373 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1374 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1375 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1376 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1377 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1378 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1380 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1381 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1383 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1384 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1385 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1386 8ba819a3 2020-07-23 stsp return err;
1389 8ba819a3 2020-07-23 stsp static const struct got_error *
1390 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1391 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1392 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1393 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1394 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1395 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1397 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1398 507dc3bb 2018-12-29 stsp int fd = -1;
1399 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1400 507dc3bb 2018-12-29 stsp int update = 0;
1401 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1402 a2c162eb 2022-10-30 thomas mode_t mode;
1404 a2c162eb 2022-10-30 thomas mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1405 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1406 a2c162eb 2022-10-30 thomas O_CLOEXEC, mode);
1407 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1408 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1409 f5375317 2020-10-20 stsp char *parent;
1410 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1412 f5375317 2020-10-20 stsp return err;
1413 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1414 f5375317 2020-10-20 stsp free(parent);
1416 21908da4 2019-01-13 stsp return err;
1417 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1418 06340621 2021-12-31 thomas O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1420 21908da4 2019-01-13 stsp if (fd == -1)
1421 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1422 230a42bd 2019-05-11 jcs ondisk_path);
1423 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1424 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1425 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1426 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1427 3b9f0f87 2020-07-23 stsp goto done;
1429 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1430 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1431 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1432 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1433 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1434 507dc3bb 2018-12-29 stsp goto done;
1436 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1437 fc2a50f2 2022-11-01 thomas ondisk_path, "");
1439 507dc3bb 2018-12-29 stsp goto done;
1440 507dc3bb 2018-12-29 stsp update = 1;
1442 a2c162eb 2022-10-30 thomas if (fchmod(fd, apply_umask(mode)) == -1) {
1443 a2c162eb 2022-10-30 thomas err = got_error_from_errno2("fchmod",
1444 a2c162eb 2022-10-30 thomas tmppath);
1445 a2c162eb 2022-10-30 thomas goto done;
1449 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1452 bd6aa359 2020-07-23 stsp if (progress_cb) {
1453 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1454 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1456 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1457 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1460 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1461 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1463 bd6aa359 2020-07-23 stsp goto done;
1466 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1468 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1469 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1472 9d31a1d8 2018-03-11 stsp if (len > 0) {
1473 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1474 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1475 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1476 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1477 b87c6f83 2018-12-24 stsp goto done;
1478 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1479 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1480 b87c6f83 2018-12-24 stsp goto done;
1482 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1484 9d31a1d8 2018-03-11 stsp } while (len != 0);
1486 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1487 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1488 816dc654 2019-02-16 stsp goto done;
1491 507dc3bb 2018-12-29 stsp if (update) {
1492 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1493 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1494 f6d8c0ac 2020-11-09 stsp goto done;
1496 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1497 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1498 230a42bd 2019-05-11 jcs ondisk_path);
1499 68ed9ba5 2019-02-10 stsp goto done;
1501 63df146d 2020-11-09 stsp free(tmppath);
1502 63df146d 2020-11-09 stsp tmppath = NULL;
1506 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1507 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1508 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1509 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1510 507dc3bb 2018-12-29 stsp free(tmppath);
1511 6353ad76 2019-02-08 stsp return err;
1514 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1515 6353ad76 2019-02-08 stsp static const struct got_error *
1516 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1518 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1519 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1520 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1521 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1522 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1524 7154f6ce 2019-03-27 stsp int i = 0;
1525 9bdd68dd 2020-01-02 naddy char *line = NULL;
1526 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1527 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1529 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1530 9bdd68dd 2020-01-02 naddy linelen = getline(&line, &linesize, f);
1531 9bdd68dd 2020-01-02 naddy if (linelen == -1) {
1532 7154f6ce 2019-03-27 stsp if (feof(f))
1534 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1538 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1539 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1541 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1546 9bdd68dd 2020-01-02 naddy free(line);
1548 7154f6ce 2019-03-27 stsp return err;
1551 e2b1e152 2019-07-13 stsp static int
1552 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1554 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1555 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1558 1ebedb77 2019-10-19 stsp static int
1559 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1561 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1562 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1563 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1564 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1565 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1566 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1569 c363b2c1 2019-08-03 stsp static unsigned char
1570 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1572 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1573 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1574 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1575 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1576 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1577 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1578 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1580 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1584 a919d5c4 2020-07-23 stsp static const struct got_error *
1585 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1586 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1587 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1589 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1590 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1591 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1592 a919d5c4 2020-07-23 stsp ssize_t elen;
1593 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1594 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1595 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1597 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1599 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1601 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1603 a919d5c4 2020-07-23 stsp return err;
1604 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1606 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1607 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1609 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1611 a919d5c4 2020-07-23 stsp if (len > 0) {
1612 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1613 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1614 a919d5c4 2020-07-23 stsp len - hdrlen);
1615 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1616 a919d5c4 2020-07-23 stsp hdrlen = 0;
1618 a919d5c4 2020-07-23 stsp } while (len != 0);
1619 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1621 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1622 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1623 a919d5c4 2020-07-23 stsp if (elen == -1)
1624 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1626 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1627 a919d5c4 2020-07-23 stsp if (elen == -1)
1628 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1631 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1632 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1634 a919d5c4 2020-07-23 stsp return NULL;
1637 7154f6ce 2019-03-27 stsp static const struct got_error *
1638 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1639 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1640 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1642 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1643 6353ad76 2019-02-08 stsp struct got_object_id id;
1644 6353ad76 2019-02-08 stsp size_t hdrlen;
1645 f4ae6ddb 2022-07-01 thomas int fd = -1, fd1 = -1;
1646 6353ad76 2019-02-08 stsp FILE *f = NULL;
1647 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1648 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1649 6353ad76 2019-02-08 stsp size_t flen, blen;
1650 dfd83cb6 2023-02-17 thomas unsigned char staged_status;
1652 dfd83cb6 2023-02-17 thomas 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 06340621 2021-12-31 thomas fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1675 3dc1dc04 2021-09-27 thomas if (fd == -1 && errno != ENOENT &&
1676 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
1677 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1678 3dc1dc04 2021-09-27 thomas 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 43010591 2023-02-17 thomas got_fileindex_entry_get_staged_blob_id(&id, ie);
1721 43010591 2023-02-17 thomas got_fileindex_entry_get_blob_id(&id, ie);
1723 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
1724 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
1725 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1726 f4ae6ddb 2022-07-01 thomas goto done;
1728 f4ae6ddb 2022-07-01 thomas 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 fc63f50d 2021-12-31 thomas 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 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1792 f4ae6ddb 2022-07-01 thomas 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 f4ae6ddb 2022-07-01 thomas 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 f4ae6ddb 2022-07-01 thomas 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 e6f4ba31 2021-09-24 thomas if (stat(ondisk_path, &sb) == -1) {
1847 e6f4ba31 2021-09-24 thomas if (errno != ENOENT) {
1848 e6f4ba31 2021-09-24 thomas err = got_error_from_errno2("stat",
1849 e6f4ba31 2021-09-24 thomas ondisk_path);
1850 e6f4ba31 2021-09-24 thomas goto done;
1852 e6f4ba31 2021-09-24 thomas sb.st_mode = GOT_DEFAULT_FILE_MODE;
1853 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1854 e6f4ba31 2021-09-24 thomas } else {
1855 e6f4ba31 2021-09-24 thomas if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1856 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1858 e6f4ba31 2021-09-24 thomas 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 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
1912 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
1913 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1914 f4ae6ddb 2022-07-01 thomas goto done;
1916 f4ae6ddb 2022-07-01 thomas 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 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
1926 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
1927 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1928 f4ae6ddb 2022-07-01 thomas goto done;
1930 234035bc 2019-06-01 stsp struct got_object_id id2;
1931 43010591 2023-02-17 thomas got_fileindex_entry_get_blob_id(&id2, ie);
1932 f4ae6ddb 2022-07-01 thomas 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 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1968 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
1969 f4ae6ddb 2022-07-01 thomas 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 ace90326 2021-09-27 thomas status == GOT_STATUS_UNVERSIONED, 0,
2001 ace90326 2021-09-27 thomas 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 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2031 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
2032 f4ae6ddb 2022-07-01 thomas 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 f6cd0243 2023-01-28 thomas got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2245 f6cd0243 2023-01-28 thomas const char *prefix)
2247 f6cd0243 2023-01-28 thomas return get_ref_name(refname, worktree, prefix);
2250 f6cd0243 2023-01-28 thomas const struct got_error *
2251 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2253 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2256 818c7501 2019-07-11 stsp static const struct got_error *
2257 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2259 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2260 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2263 818c7501 2019-07-11 stsp static const struct got_error *
2264 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2266 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2269 818c7501 2019-07-11 stsp static const struct got_error *
2270 818c7501 2019-07-11 stsp get_rebase_branch_symref_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_BRANCH_REF_PREFIX);
2276 818c7501 2019-07-11 stsp static const struct got_error *
2277 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2279 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2280 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2283 0ebf8283 2019-07-24 stsp static const struct got_error *
2284 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_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_TMP_REF_PREFIX);
2290 0ebf8283 2019-07-24 stsp static const struct got_error *
2291 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_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_BRANCH_REF_PREFIX);
2297 0ebf8283 2019-07-24 stsp static const struct got_error *
2298 0ebf8283 2019-07-24 stsp get_histedit_base_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_BASE_COMMIT_REF_PREFIX);
2304 0ebf8283 2019-07-24 stsp static const struct got_error *
2305 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2307 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2308 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2311 0ebf8283 2019-07-24 stsp const struct got_error *
2312 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2313 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2315 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2316 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2317 0ebf8283 2019-07-24 stsp *path = NULL;
2318 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2320 0ebf8283 2019-07-24 stsp return NULL;
2323 10604dce 2021-09-24 thomas static const struct got_error *
2324 10604dce 2021-09-24 thomas get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2326 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2327 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2330 10604dce 2021-09-24 thomas static const struct got_error *
2331 10604dce 2021-09-24 thomas get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2333 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2334 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2338 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2339 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2341 517bab73 2019-03-11 stsp static const struct got_error *
2342 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2344 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2345 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2346 517bab73 2019-03-11 stsp char *refname;
2348 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2350 517bab73 2019-03-11 stsp return err;
2352 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2354 0cd1c46a 2019-03-11 stsp goto done;
2356 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2358 0cd1c46a 2019-03-11 stsp free(refname);
2360 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2361 3e3a69f1 2019-07-25 stsp return err;
2364 3e3a69f1 2019-07-25 stsp static const struct got_error *
2365 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2367 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2369 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2370 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2371 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2372 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2374 9d31a1d8 2018-03-11 stsp return err;
2378 ebf99748 2019-05-09 stsp static const struct got_error *
2379 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2380 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2382 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2383 ebf99748 2019-05-09 stsp FILE *index = NULL;
2385 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2386 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2387 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2388 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2390 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2392 ebf99748 2019-05-09 stsp goto done;
2394 c56c5d8a 2021-12-31 thomas index = fopen(*fileindex_path, "rbe");
2395 ebf99748 2019-05-09 stsp if (index == NULL) {
2396 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2397 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2399 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2400 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2401 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2404 ebf99748 2019-05-09 stsp if (err) {
2405 ebf99748 2019-05-09 stsp free(*fileindex_path);
2406 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2407 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2408 ebf99748 2019-05-09 stsp *fileindex = NULL;
2410 ebf99748 2019-05-09 stsp return err;
2413 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2414 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2415 c932eeeb 2019-05-22 stsp const char *path;
2416 c932eeeb 2019-05-22 stsp size_t path_len;
2417 c932eeeb 2019-05-22 stsp const char *entry_name;
2418 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2419 a484d721 2019-06-10 stsp void *progress_arg;
2422 c932eeeb 2019-05-22 stsp static const struct got_error *
2423 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2425 1ee397ad 2019-07-12 stsp const struct got_error *err;
2426 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2428 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2429 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2430 c932eeeb 2019-05-22 stsp return NULL;
2431 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2432 102ff934 2019-06-11 stsp return NULL;
2434 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2435 a769b60b 2021-06-27 stsp return NULL;
2437 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2438 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2439 c932eeeb 2019-05-22 stsp return NULL;
2441 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2442 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2443 edd02c5e 2019-07-11 stsp ie->path);
2445 1ee397ad 2019-07-12 stsp return err;
2447 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2448 c932eeeb 2019-05-22 stsp return NULL;
2451 748c5641 2023-02-07 thomas /* Bump base commit ID of all files within an updated part of the work tree. */
2452 a615e0e7 2020-12-16 stsp static const struct got_error *
2453 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2454 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2455 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2457 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2459 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2460 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2461 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2462 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2463 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2464 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2466 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2467 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2470 9c6338c4 2019-06-02 stsp static const struct got_error *
2471 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2473 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2474 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2475 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2476 867630bb 2020-01-17 stsp struct timespec timeout;
2478 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2479 fc2a50f2 2022-11-01 thomas fileindex_path, "");
2481 9c6338c4 2019-06-02 stsp goto done;
2483 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2485 9c6338c4 2019-06-02 stsp goto done;
2487 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2488 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2489 9c6338c4 2019-06-02 stsp fileindex_path);
2490 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2494 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2495 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2496 867630bb 2020-01-17 stsp * was recorded in the file index.
2498 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2499 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2500 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2502 9c6338c4 2019-06-02 stsp if (new_index)
2503 9c6338c4 2019-06-02 stsp fclose(new_index);
2504 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2505 9c6338c4 2019-06-02 stsp return err;
2508 6ced4176 2019-07-12 stsp static const struct got_error *
2509 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2510 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2511 945f9229 2022-04-16 thomas struct got_commit_object *base_commit, struct got_worktree *worktree,
2512 945f9229 2022-04-16 thomas struct got_repository *repo)
2514 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2515 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2516 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2517 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2519 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2520 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2521 6ced4176 2019-07-12 stsp *tree_id = NULL;
2523 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2524 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2525 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2526 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2527 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2528 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2529 6ced4176 2019-07-12 stsp goto done;
2531 945f9229 2022-04-16 thomas err = got_object_id_by_path(tree_id, repo, base_commit,
2532 945f9229 2022-04-16 thomas worktree->path_prefix);
2534 6ced4176 2019-07-12 stsp goto done;
2535 6ced4176 2019-07-12 stsp return NULL;
2538 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2540 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2541 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2542 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2543 6ced4176 2019-07-12 stsp goto done;
2546 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2548 6ced4176 2019-07-12 stsp goto done;
2550 6ced4176 2019-07-12 stsp free(in_repo_path);
2551 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2553 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2555 6ced4176 2019-07-12 stsp goto done;
2557 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2558 6ced4176 2019-07-12 stsp /* Check out a single file. */
2559 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2560 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2561 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2562 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2563 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2564 6ced4176 2019-07-12 stsp goto done;
2566 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2567 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2568 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2569 6ced4176 2019-07-12 stsp goto done;
2572 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2573 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2575 6ced4176 2019-07-12 stsp return err;
2576 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2577 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2578 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2579 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2580 6ced4176 2019-07-12 stsp goto done;
2583 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2584 945f9229 2022-04-16 thomas base_commit, in_repo_path);
2586 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2587 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2588 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2589 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2590 6ced4176 2019-07-12 stsp goto done;
2592 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2593 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2594 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2595 6ced4176 2019-07-12 stsp goto done;
2600 6ced4176 2019-07-12 stsp free(in_repo_path);
2601 6ced4176 2019-07-12 stsp if (err) {
2602 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2603 6ced4176 2019-07-12 stsp free(*tree_relpath);
2604 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2605 6ced4176 2019-07-12 stsp free(*tree_id);
2606 6ced4176 2019-07-12 stsp *tree_id = NULL;
2608 07ed472d 2019-07-12 stsp return err;
2611 07ed472d 2019-07-12 stsp static const struct got_error *
2612 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2613 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2614 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2615 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2617 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2618 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2619 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2620 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2621 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2623 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2624 7f47418f 2019-12-20 stsp if (err) {
2625 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2626 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2627 7f47418f 2019-12-20 stsp goto done;
2628 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2629 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2631 7f47418f 2019-12-20 stsp return err;
2634 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2635 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2637 07ed472d 2019-07-12 stsp goto done;
2639 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2641 07ed472d 2019-07-12 stsp goto done;
2643 07ed472d 2019-07-12 stsp if (entry_name &&
2644 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2645 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2646 07ed472d 2019-07-12 stsp goto done;
2649 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2650 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2651 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2652 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2653 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2654 07ed472d 2019-07-12 stsp arg.repo = repo;
2655 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2656 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2657 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2658 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2659 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2660 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2663 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2664 07ed472d 2019-07-12 stsp if (commit)
2665 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2666 6ced4176 2019-07-12 stsp return err;
2669 9d31a1d8 2018-03-11 stsp const struct got_error *
2670 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2671 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2672 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2673 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2675 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2676 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2677 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2678 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2679 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2680 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2681 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2682 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2683 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2684 f2ea84fa 2019-07-27 stsp int entry_type;
2685 f2ea84fa 2019-07-27 stsp char *relpath;
2686 f2ea84fa 2019-07-27 stsp char *entry_name;
2687 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2688 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2690 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2692 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2694 9d31a1d8 2018-03-11 stsp return err;
2696 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
2697 945f9229 2022-04-16 thomas worktree->base_commit_id);
2698 945f9229 2022-04-16 thomas if (err)
2699 945f9229 2022-04-16 thomas goto done;
2701 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2702 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2703 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2704 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2705 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2706 f2ea84fa 2019-07-27 stsp goto done;
2709 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2710 945f9229 2022-04-16 thomas &tpd->relpath, &tpd->tree_id, pe->path, commit,
2711 945f9229 2022-04-16 thomas worktree, repo);
2712 f2ea84fa 2019-07-27 stsp if (err) {
2713 f2ea84fa 2019-07-27 stsp free(tpd);
2714 6ced4176 2019-07-12 stsp goto done;
2717 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2718 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2719 f2ea84fa 2019-07-27 stsp if (err) {
2720 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2721 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2722 f2ea84fa 2019-07-27 stsp free(tpd);
2723 f2ea84fa 2019-07-27 stsp goto done;
2726 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2728 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2732 51514078 2018-12-25 stsp * Read the file index.
2733 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2734 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2736 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2738 c4cdcb68 2019-04-03 stsp goto done;
2740 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2741 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2742 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2744 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2745 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2746 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2750 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2751 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2752 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2753 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2754 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2755 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2756 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2757 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2761 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2763 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2764 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2765 af12c6b9 2019-06-04 stsp err = sync_err;
2767 9c6338c4 2019-06-02 stsp free(fileindex_path);
2769 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2770 9d31a1d8 2018-03-11 stsp if (commit)
2771 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2772 5ade8233 2019-07-12 stsp if (fileindex)
2773 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2774 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2775 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2776 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2777 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2778 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2779 f2ea84fa 2019-07-27 stsp free(tpd);
2781 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2782 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2783 9d31a1d8 2018-03-11 stsp err = unlockerr;
2784 f8d1f275 2019-02-04 stsp return err;
2787 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2788 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2789 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2790 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2791 234035bc 2019-06-01 stsp void *progress_arg;
2792 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2793 234035bc 2019-06-01 stsp void *cancel_arg;
2794 f69721c3 2019-10-21 stsp const char *label_orig;
2795 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2796 ace90326 2021-09-27 thomas int allow_bad_symlinks;
2799 234035bc 2019-06-01 stsp static const struct got_error *
2800 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2801 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
2802 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
2803 a0f32f33 2022-06-13 thomas const char *path1, const char *path2,
2804 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2806 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2807 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2808 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2809 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2810 234035bc 2019-06-01 stsp struct stat sb;
2811 234035bc 2019-06-01 stsp unsigned char status;
2812 234035bc 2019-06-01 stsp int local_changes_subsumed;
2813 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2814 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2816 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2817 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2818 d6c87207 2019-08-02 stsp strlen(path2));
2819 1ee397ad 2019-07-12 stsp if (ie == NULL)
2820 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2821 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2823 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2824 234035bc 2019-06-01 stsp path2) == -1)
2825 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2827 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2830 234035bc 2019-06-01 stsp goto done;
2832 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2833 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2834 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2835 234035bc 2019-06-01 stsp goto done;
2837 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2838 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2839 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2840 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2841 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2842 234035bc 2019-06-01 stsp goto done;
2845 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2846 36bf999c 2020-07-23 stsp char *link_target2;
2847 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2849 36bf999c 2020-07-23 stsp goto done;
2850 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2851 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2852 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2853 36bf999c 2020-07-23 stsp free(link_target2);
2857 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2858 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2859 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2860 1af628f4 2021-06-03 stsp goto done;
2862 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2863 1af628f4 2021-06-03 stsp f_orig, blob1);
2865 1af628f4 2021-06-03 stsp goto done;
2867 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2868 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2869 1af628f4 2021-06-03 stsp goto done;
2870 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2871 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2873 1af628f4 2021-06-03 stsp goto done;
2875 48b4f239 2021-12-31 thomas fd = open(ondisk_path,
2876 48b4f239 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2877 1af628f4 2021-06-03 stsp if (fd == -1) {
2878 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2879 1af628f4 2021-06-03 stsp ondisk_path);
2880 1af628f4 2021-06-03 stsp goto done;
2882 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2883 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2884 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2885 1af628f4 2021-06-03 stsp ondisk_path);
2886 1af628f4 2021-06-03 stsp close(fd);
2887 1af628f4 2021-06-03 stsp goto done;
2889 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2891 1af628f4 2021-06-03 stsp goto done;
2892 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2893 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2894 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2895 1af628f4 2021-06-03 stsp goto done;
2897 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2898 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2899 630fc61f 2023-01-29 thomas mode2, a->label_orig, NULL, label_deriv2,
2900 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2901 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2903 234035bc 2019-06-01 stsp } else if (blob1) {
2904 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2905 d6c87207 2019-08-02 stsp strlen(path1));
2906 1ee397ad 2019-07-12 stsp if (ie == NULL)
2907 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2908 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2910 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2911 2b92fad7 2019-06-02 stsp path1) == -1)
2912 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2914 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2917 2b92fad7 2019-06-02 stsp goto done;
2919 2b92fad7 2019-06-02 stsp switch (status) {
2920 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2921 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2922 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2924 1ee397ad 2019-07-12 stsp goto done;
2925 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2927 2b92fad7 2019-06-02 stsp goto done;
2929 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2931 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2932 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2933 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2934 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2936 1ee397ad 2019-07-12 stsp goto done;
2938 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2940 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2941 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2942 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2943 e8f02263 2022-01-23 thomas off_t blob1_size;
2945 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2946 0a22ca1a 2020-09-23 stsp * exists in the repository.
2948 e8f02263 2022-01-23 thomas err = got_object_blob_file_create(&id, &blob1_f,
2949 e8f02263 2022-01-23 thomas &blob1_size, path1);
2951 0a22ca1a 2020-09-23 stsp goto done;
2952 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2953 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2954 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2956 0a22ca1a 2020-09-23 stsp goto done;
2957 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2960 0a22ca1a 2020-09-23 stsp goto done;
2962 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2965 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2966 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2968 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2969 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2972 0a22ca1a 2020-09-23 stsp goto done;
2975 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2976 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2977 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2978 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2980 1ee397ad 2019-07-12 stsp goto done;
2982 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2983 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2985 1ee397ad 2019-07-12 stsp goto done;
2990 234035bc 2019-06-01 stsp } else if (blob2) {
2991 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2992 234035bc 2019-06-01 stsp path2) == -1)
2993 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2994 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2995 d6c87207 2019-08-02 stsp strlen(path2));
2997 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2998 7f91a133 2019-12-13 stsp -1, NULL, repo);
3000 234035bc 2019-06-01 stsp goto done;
3001 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3002 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3003 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3004 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3005 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3006 1ee397ad 2019-07-12 stsp status, path2);
3007 234035bc 2019-06-01 stsp goto done;
3009 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3010 36bf999c 2020-07-23 stsp char *link_target2;
3011 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3014 36bf999c 2020-07-23 stsp goto done;
3015 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3016 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3017 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3018 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3019 36bf999c 2020-07-23 stsp free(link_target2);
3020 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3021 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3022 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3023 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3024 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3025 526a746f 2020-07-23 stsp a->progress_arg);
3027 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3028 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3031 dfe9fba0 2020-07-23 stsp goto done;
3032 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3033 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3034 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3035 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3037 234035bc 2019-06-01 stsp goto done;
3040 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3041 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3042 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3043 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3044 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3045 ace90326 2021-09-27 thomas 0, 1, a->allow_bad_symlinks, repo,
3046 ace90326 2021-09-27 thomas a->progress_cb, a->progress_arg);
3048 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3049 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3050 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3053 234035bc 2019-06-01 stsp goto done;
3054 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3056 234035bc 2019-06-01 stsp goto done;
3057 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3058 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3059 3969253a 2020-03-07 stsp if (err) {
3060 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3061 3969253a 2020-03-07 stsp goto done;
3063 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3064 2b92fad7 2019-06-02 stsp if (err) {
3065 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3066 2b92fad7 2019-06-02 stsp goto done;
3068 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3069 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3070 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3075 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3076 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3077 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3078 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3079 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3080 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3081 1af628f4 2021-06-03 stsp free(id_str);
3082 54d5be07 2021-06-03 stsp free(label_deriv2);
3083 234035bc 2019-06-01 stsp free(ondisk_path);
3084 234035bc 2019-06-01 stsp return err;
3087 69de9dd4 2021-09-03 stsp static const struct got_error *
3088 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3090 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3092 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3093 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3094 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3095 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3096 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3098 69de9dd4 2021-09-03 stsp return NULL;
3101 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3102 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3103 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3104 234035bc 2019-06-01 stsp struct got_repository *repo;
3107 234035bc 2019-06-01 stsp static const struct got_error *
3108 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3109 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
3110 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
3111 a0f32f33 2022-06-13 thomas const char *path1, const char *path2,
3112 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3114 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3115 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3116 234035bc 2019-06-01 stsp unsigned char status;
3117 234035bc 2019-06-01 stsp struct stat sb;
3118 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3119 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3120 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3121 234035bc 2019-06-01 stsp char *ondisk_path;
3123 69de9dd4 2021-09-03 stsp if (id == NULL)
3124 69de9dd4 2021-09-03 stsp return NULL;
3126 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3127 69de9dd4 2021-09-03 stsp if (ie == NULL)
3128 69de9dd4 2021-09-03 stsp return NULL;
3130 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3132 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3134 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3135 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3136 5546d466 2021-09-02 stsp free(ondisk_path);
3138 234035bc 2019-06-01 stsp return err;
3139 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3140 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3142 234035bc 2019-06-01 stsp return NULL;
3145 818c7501 2019-07-11 stsp static const struct got_error *
3146 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3147 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3148 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3149 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3150 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3152 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3153 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3154 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3155 945f9229 2022-04-16 thomas struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3156 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3157 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3158 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3159 a0f32f33 2022-06-13 thomas FILE *f1 = NULL, *f2 = NULL;
3160 19a6a6b5 2022-07-01 thomas int fd1 = -1, fd2 = -1;
3162 03415a1a 2019-06-02 stsp if (commit_id1) {
3163 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit1, repo, commit_id1);
3164 945f9229 2022-04-16 thomas if (err)
3165 945f9229 2022-04-16 thomas goto done;
3166 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id1, repo, commit1,
3167 03415a1a 2019-06-02 stsp worktree->path_prefix);
3168 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3169 03415a1a 2019-06-02 stsp goto done;
3171 69d57f3d 2020-07-31 stsp if (tree_id1) {
3172 69d57f3d 2020-07-31 stsp char *id_str;
3174 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3176 03415a1a 2019-06-02 stsp goto done;
3178 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3180 f69721c3 2019-10-21 stsp goto done;
3182 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3183 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3184 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3185 f69721c3 2019-10-21 stsp free(id_str);
3186 f69721c3 2019-10-21 stsp goto done;
3188 f69721c3 2019-10-21 stsp free(id_str);
3190 a0f32f33 2022-06-13 thomas f1 = got_opentemp();
3191 a0f32f33 2022-06-13 thomas if (f1 == NULL) {
3192 a0f32f33 2022-06-13 thomas err = got_error_from_errno("got_opentemp");
3193 a0f32f33 2022-06-13 thomas goto done;
3197 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit2, repo, commit_id2);
3198 945f9229 2022-04-16 thomas if (err)
3199 945f9229 2022-04-16 thomas goto done;
3201 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id2, repo, commit2,
3202 234035bc 2019-06-01 stsp worktree->path_prefix);
3204 234035bc 2019-06-01 stsp goto done;
3206 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3208 234035bc 2019-06-01 stsp goto done;
3210 a0f32f33 2022-06-13 thomas f2 = got_opentemp();
3211 a0f32f33 2022-06-13 thomas if (f2 == NULL) {
3212 a0f32f33 2022-06-13 thomas err = got_error_from_errno("got_opentemp");
3213 19a6a6b5 2022-07-01 thomas goto done;
3216 19a6a6b5 2022-07-01 thomas fd1 = got_opentempfd();
3217 19a6a6b5 2022-07-01 thomas if (fd1 == -1) {
3218 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
3219 a0f32f33 2022-06-13 thomas goto done;
3222 19a6a6b5 2022-07-01 thomas fd2 = got_opentempfd();
3223 19a6a6b5 2022-07-01 thomas if (fd2 == -1) {
3224 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
3225 19a6a6b5 2022-07-01 thomas goto done;
3228 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3229 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3230 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3231 19a6a6b5 2022-07-01 thomas err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3232 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3234 69de9dd4 2021-09-03 stsp goto done;
3236 234035bc 2019-06-01 stsp arg.worktree = worktree;
3237 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3238 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3239 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3240 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3241 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3242 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3243 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3244 ace90326 2021-09-27 thomas arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3245 19a6a6b5 2022-07-01 thomas err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3246 a0f32f33 2022-06-13 thomas merge_file_cb, &arg, 1);
3247 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3248 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3249 af12c6b9 2019-06-04 stsp err = sync_err;
3251 945f9229 2022-04-16 thomas if (commit1)
3252 945f9229 2022-04-16 thomas got_object_commit_close(commit1);
3253 945f9229 2022-04-16 thomas if (commit2)
3254 945f9229 2022-04-16 thomas got_object_commit_close(commit2);
3255 234035bc 2019-06-01 stsp if (tree1)
3256 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3257 234035bc 2019-06-01 stsp if (tree2)
3258 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3259 a0f32f33 2022-06-13 thomas if (f1 && fclose(f1) == EOF && err == NULL)
3260 a0f32f33 2022-06-13 thomas err = got_error_from_errno("fclose");
3261 a0f32f33 2022-06-13 thomas if (f2 && fclose(f2) == EOF && err == NULL)
3262 a0f32f33 2022-06-13 thomas err = got_error_from_errno("fclose");
3263 19a6a6b5 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3264 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("close");
3265 19a6a6b5 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3266 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("close");
3267 f69721c3 2019-10-21 stsp free(label_orig);
3268 818c7501 2019-07-11 stsp return err;
3271 818c7501 2019-07-11 stsp const struct got_error *
3272 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3273 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3274 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3275 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3277 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3278 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3279 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3281 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3283 818c7501 2019-07-11 stsp return err;
3285 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3287 818c7501 2019-07-11 stsp goto done;
3289 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3290 69de9dd4 2021-09-03 stsp worktree);
3292 818c7501 2019-07-11 stsp goto done;
3294 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3295 10604dce 2021-09-24 thomas commit_id2, repo, progress_cb, progress_arg,
3296 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
3298 818c7501 2019-07-11 stsp if (fileindex)
3299 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3300 818c7501 2019-07-11 stsp free(fileindex_path);
3301 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3302 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3303 234035bc 2019-06-01 stsp err = unlockerr;
3304 234035bc 2019-06-01 stsp return err;
3307 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3308 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3309 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3310 927df6b7 2019-02-10 stsp const char *status_path;
3311 927df6b7 2019-02-10 stsp size_t status_path_len;
3312 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3313 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3314 f8d1f275 2019-02-04 stsp void *status_arg;
3315 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3316 f8d1f275 2019-02-04 stsp void *cancel_arg;
3317 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3318 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3319 f2a9dc41 2019-12-13 tracey int report_unchanged;
3320 3143d852 2020-06-25 stsp int no_ignores;
3323 f8d1f275 2019-02-04 stsp static const struct got_error *
3324 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3325 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3326 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3327 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3329 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3330 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3331 dfd83cb6 2023-02-17 thomas unsigned char staged_status;
3332 927df6b7 2019-02-10 stsp struct stat sb;
3333 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3334 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3335 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3337 dfd83cb6 2023-02-17 thomas staged_status = get_staged_status(ie);
3338 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3340 98eaaa12 2019-08-03 stsp return err;
3342 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3343 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3344 98eaaa12 2019-08-03 stsp return NULL;
3346 43010591 2023-02-17 thomas if (got_fileindex_entry_has_blob(ie))
3347 43010591 2023-02-17 thomas blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
3348 43010591 2023-02-17 thomas if (got_fileindex_entry_has_commit(ie))
3349 43010591 2023-02-17 thomas commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
3350 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3351 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3352 43010591 2023-02-17 thomas staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
3353 43010591 2023-02-17 thomas &staged_blob_id, ie);
3356 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3357 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3360 927df6b7 2019-02-10 stsp static const struct got_error *
3361 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3362 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3364 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3365 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3366 f8d1f275 2019-02-04 stsp char *abspath;
3368 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3369 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3371 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3372 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3373 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3374 927df6b7 2019-02-10 stsp return NULL;
3376 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3377 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3378 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3379 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3381 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3382 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3383 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3386 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3387 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3388 f8d1f275 2019-02-04 stsp free(abspath);
3389 9d31a1d8 2018-03-11 stsp return err;
3392 f8d1f275 2019-02-04 stsp static const struct got_error *
3393 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3395 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3396 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3397 2ec1f75b 2019-03-26 stsp unsigned char status;
3399 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3400 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3402 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3403 927df6b7 2019-02-10 stsp return NULL;
3405 43010591 2023-02-17 thomas got_fileindex_entry_get_blob_id(&blob_id, ie);
3406 43010591 2023-02-17 thomas got_fileindex_entry_get_commit_id(&commit_id, ie);
3407 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3408 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3410 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3411 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3412 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3415 ef20f542 2022-06-26 thomas static void
3416 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3418 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3420 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3421 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3423 21c2d8be 2023-01-10 thomas got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3425 21c2d8be 2023-01-10 thomas got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3428 6841da00 2019-08-08 stsp static const struct got_error *
3429 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3431 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3432 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3433 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3434 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3435 6841da00 2019-08-08 stsp size_t linesize = 0;
3436 6841da00 2019-08-08 stsp ssize_t linelen;
3438 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3439 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3440 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3441 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3443 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3444 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3445 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3447 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3448 bd8de430 2019-10-04 stsp if (line[0] == '#')
3451 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3452 bd8de430 2019-10-04 stsp if (line[0] == '!')
3455 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3456 6841da00 2019-08-08 stsp line) == -1) {
3457 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3458 6841da00 2019-08-08 stsp goto done;
3460 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3462 6841da00 2019-08-08 stsp goto done;
3464 6841da00 2019-08-08 stsp if (ferror(f)) {
3465 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3466 6841da00 2019-08-08 stsp goto done;
3469 6841da00 2019-08-08 stsp dirpath = strdup(path);
3470 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3471 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3472 6841da00 2019-08-08 stsp goto done;
3474 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3476 6841da00 2019-08-08 stsp free(line);
3477 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3478 6841da00 2019-08-08 stsp free(dirpath);
3479 21c2d8be 2023-01-10 thomas got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3481 6841da00 2019-08-08 stsp return err;
3484 ef20f542 2022-06-26 thomas static int
3485 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3487 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3489 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3490 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3491 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3492 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3494 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3495 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3497 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3499 bd8de430 2019-10-04 stsp pattern += 3;
3501 bd8de430 2019-10-04 stsp while (*p) {
3502 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3503 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3504 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3505 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3507 bd8de430 2019-10-04 stsp while (*p == '/')
3517 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3518 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3519 6841da00 2019-08-08 stsp * ignores backwards.
3521 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3522 6841da00 2019-08-08 stsp while (pe) {
3523 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3524 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3525 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3526 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3527 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3528 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3529 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3530 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3531 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3536 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3542 6841da00 2019-08-08 stsp static const struct got_error *
3543 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3544 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3546 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3547 6841da00 2019-08-08 stsp char *ignorespath;
3548 886cec17 2019-12-15 stsp int fd = -1;
3549 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3551 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3552 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3553 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3555 886cec17 2019-12-15 stsp if (dirfd != -1) {
3556 fc63f50d 2021-12-31 thomas fd = openat(dirfd, ignores_filename,
3557 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3558 886cec17 2019-12-15 stsp if (fd == -1) {
3559 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3560 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3561 886cec17 2019-12-15 stsp ignorespath);
3563 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3564 b6b86fd1 2022-08-30 thomas if (ignoresfile == NULL)
3565 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3566 886cec17 2019-12-15 stsp ignorespath);
3569 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3573 c56c5d8a 2021-12-31 thomas ignoresfile = fopen(ignorespath, "re");
3574 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3575 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3576 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3577 886cec17 2019-12-15 stsp ignorespath);
3579 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3582 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3583 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3584 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3585 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3586 6841da00 2019-08-08 stsp free(ignorespath);
3587 6841da00 2019-08-08 stsp return err;
3590 f8d1f275 2019-02-04 stsp static const struct got_error *
3591 6092c299 2021-10-04 thomas status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3592 6092c299 2021-10-04 thomas int dirfd)
3594 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3595 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3596 f8d1f275 2019-02-04 stsp char *path = NULL;
3598 6092c299 2021-10-04 thomas if (ignore != NULL)
3599 6092c299 2021-10-04 thomas *ignore = 0;
3601 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3602 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3604 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3605 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3606 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3608 f8d1f275 2019-02-04 stsp path = de->d_name;
3611 6092c299 2021-10-04 thomas if (de->d_type == DT_DIR) {
3612 6092c299 2021-10-04 thomas if (!a->no_ignores && ignore != NULL &&
3613 6092c299 2021-10-04 thomas match_ignores(a->ignores, path))
3614 6092c299 2021-10-04 thomas *ignore = 1;
3615 6092c299 2021-10-04 thomas } else if (!match_ignores(a->ignores, path) &&
3616 6092c299 2021-10-04 thomas got_path_is_child(path, a->status_path, a->status_path_len))
3617 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3618 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3619 f8d1f275 2019-02-04 stsp if (parent_path[0])
3620 f8d1f275 2019-02-04 stsp free(path);
3621 b72f483a 2019-02-05 stsp return err;
3624 347d1d3e 2019-07-12 stsp static const struct got_error *
3625 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3627 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3628 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3630 3143d852 2020-06-25 stsp if (a->no_ignores)
3631 3143d852 2020-06-25 stsp return NULL;
3633 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3634 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3636 3143d852 2020-06-25 stsp return err;
3638 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3639 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3641 3143d852 2020-06-25 stsp return err;
3644 3143d852 2020-06-25 stsp static const struct got_error *
3645 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3646 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3647 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3648 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3650 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3651 abb4604f 2019-07-27 stsp struct stat sb;
3653 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3655 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3656 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3658 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3659 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3660 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3661 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3662 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3665 fe1d8685 2022-02-12 thomas if (!no_ignores && match_ignores(ignores, path))
3666 fe1d8685 2022-02-12 thomas return NULL;
3668 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3669 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3670 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3672 abb4604f 2019-07-27 stsp return NULL;
3675 3143d852 2020-06-25 stsp static const struct got_error *
3676 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3677 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3679 3143d852 2020-06-25 stsp const struct got_error *err;
3680 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3682 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3683 3143d852 2020-06-25 stsp ".cvsignore");
3685 3143d852 2020-06-25 stsp return err;
3687 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3688 3143d852 2020-06-25 stsp ".gitignore");
3690 3143d852 2020-06-25 stsp return err;
3692 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3693 3143d852 2020-06-25 stsp if (err) {
3694 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3695 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3696 3143d852 2020-06-25 stsp return err;
3698 3143d852 2020-06-25 stsp for (;;) {
3699 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3700 3143d852 2020-06-25 stsp ".cvsignore");
3703 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3704 3143d852 2020-06-25 stsp ".gitignore");
3707 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3708 3143d852 2020-06-25 stsp if (err) {
3709 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3710 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3713 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3715 b737c85a 2020-06-26 stsp free(parent_path);
3716 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3717 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3720 b737c85a 2020-06-26 stsp free(parent_path);
3721 b737c85a 2020-06-26 stsp free(next_parent_path);
3722 3143d852 2020-06-25 stsp return err;
3725 abb4604f 2019-07-27 stsp static const struct got_error *
3726 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3727 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3728 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3729 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3730 f2a9dc41 2019-12-13 tracey int report_unchanged)
3732 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3733 6fc93f37 2019-12-13 stsp int fd = -1;
3734 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3735 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3736 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3737 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3738 a78810f8 2022-03-13 thomas struct got_fileindex_entry *ie;
3740 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3742 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3743 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3744 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3746 a78810f8 2022-03-13 thomas ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3747 a78810f8 2022-03-13 thomas if (ie) {
3748 a78810f8 2022-03-13 thomas err = report_single_file_status(path, ondisk_path,
3749 a78810f8 2022-03-13 thomas fileindex, status_cb, status_arg, repo,
3750 a78810f8 2022-03-13 thomas report_unchanged, &ignores, no_ignores);
3751 a78810f8 2022-03-13 thomas goto done;
3754 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3755 6fc93f37 2019-12-13 stsp if (fd == -1) {
3756 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3757 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
3758 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3760 ff56836b 2021-07-08 stsp if (!no_ignores) {
3761 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3762 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3764 ff56836b 2021-07-08 stsp goto done;
3766 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3767 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3768 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3771 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3772 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3773 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3774 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3775 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3776 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3777 abb4604f 2019-07-27 stsp arg.status_path = path;
3778 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3779 abb4604f 2019-07-27 stsp arg.repo = repo;
3780 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3781 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3782 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3783 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3784 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3785 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3786 022fae89 2019-12-06 tracey if (!no_ignores) {
3787 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3788 3143d852 2020-06-25 stsp worktree->root_path, path);
3790 3143d852 2020-06-25 stsp goto done;
3792 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3793 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3794 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3797 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3798 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3799 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3800 927df6b7 2019-02-10 stsp free(ondisk_path);
3801 347d1d3e 2019-07-12 stsp return err;
3804 347d1d3e 2019-07-12 stsp const struct got_error *
3805 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3806 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3807 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3808 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3810 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3811 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3812 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3813 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3815 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3817 347d1d3e 2019-07-12 stsp return err;
3819 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3820 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3821 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3822 f6343036 2021-06-22 stsp no_ignores, 0);
3826 f8d1f275 2019-02-04 stsp free(fileindex_path);
3827 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3828 f8d1f275 2019-02-04 stsp return err;
3831 6c7ab921 2019-03-18 stsp const struct got_error *
3832 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3833 6c7ab921 2019-03-18 stsp const char *arg)
3835 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3836 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3837 6c7ab921 2019-03-18 stsp size_t len;
3838 00bb5ea0 2020-07-23 stsp struct stat sb;
3839 01740607 2020-11-04 stsp char *abspath = NULL;
3840 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3842 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3844 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3845 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3846 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3848 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3849 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3850 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3851 00bb5ea0 2020-07-23 stsp goto done;
3853 727173c3 2020-11-06 stsp sb.st_mode = 0;
3855 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3857 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3858 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3859 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3860 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3862 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3863 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3864 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3865 00bb5ea0 2020-07-23 stsp goto done;
3869 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3870 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3872 d0710d08 2019-07-22 stsp goto done;
3873 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3874 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3875 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3876 00bb5ea0 2020-07-23 stsp goto done;
3879 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3880 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3881 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3882 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3883 00bb5ea0 2020-07-23 stsp goto done;
3885 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3886 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3887 01740607 2020-11-04 stsp goto done;
3889 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3890 01740607 2020-11-04 stsp sizeof(canonpath));
3892 00bb5ea0 2020-07-23 stsp goto done;
3893 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3894 01740607 2020-11-04 stsp if (resolved == NULL) {
3895 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3896 01740607 2020-11-04 stsp goto done;
3901 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3902 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3903 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3904 6c7ab921 2019-03-18 stsp goto done;
3907 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3908 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3909 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3911 f6d88e1a 2019-05-29 stsp goto done;
3913 f6d88e1a 2019-05-29 stsp path = strdup("");
3914 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3915 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3916 f6d88e1a 2019-05-29 stsp goto done;
3920 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3921 6c7ab921 2019-03-18 stsp len = strlen(path);
3922 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3923 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3927 01740607 2020-11-04 stsp free(abspath);
3928 6c7ab921 2019-03-18 stsp free(resolved);
3929 d0710d08 2019-07-22 stsp free(cwd);
3930 6c7ab921 2019-03-18 stsp if (err == NULL)
3931 6c7ab921 2019-03-18 stsp *wt_path = path;
3933 6c7ab921 2019-03-18 stsp free(path);
3934 d00136be 2019-03-26 stsp return err;
3937 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3938 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3939 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3940 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3941 4e68cba3 2019-11-23 stsp void *progress_arg;
3942 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3945 4e68cba3 2019-11-23 stsp static const struct got_error *
3946 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3947 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3948 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3949 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3951 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3952 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3953 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3954 6d022e97 2019-08-04 stsp struct stat sb;
3955 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3957 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3958 dbb83fbd 2019-12-12 stsp relpath) == -1)
3959 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3961 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3963 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3964 12463d8b 2019-12-13 stsp de_name, a->repo);
3966 dbb83fbd 2019-12-12 stsp goto done;
3967 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3968 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3969 dbb83fbd 2019-12-12 stsp goto done;
3970 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3972 dbb83fbd 2019-12-12 stsp goto done;
3975 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3976 84bf00a6 2022-02-12 thomas if (status == GOT_STATUS_NONEXISTENT)
3977 84bf00a6 2022-02-12 thomas err = got_error_set_errno(ENOENT, ondisk_path);
3979 84bf00a6 2022-02-12 thomas err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3980 dbb83fbd 2019-12-12 stsp goto done;
3983 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3985 4e68cba3 2019-11-23 stsp goto done;
3986 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3987 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3988 3969253a 2020-03-07 stsp if (err) {
3989 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3990 3969253a 2020-03-07 stsp goto done;
3992 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3993 07f5b47a 2019-06-02 stsp if (err) {
3994 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3995 4e68cba3 2019-11-23 stsp goto done;
3998 dbb83fbd 2019-12-12 stsp free(ondisk_path);
4000 dbb83fbd 2019-12-12 stsp return err;
4001 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
4002 dbb83fbd 2019-12-12 stsp return NULL;
4003 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4006 d00136be 2019-03-26 stsp const struct got_error *
4007 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4008 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4009 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4010 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4012 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4013 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4014 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4015 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4016 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4018 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4020 d00136be 2019-03-26 stsp return err;
4022 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4024 d00136be 2019-03-26 stsp goto done;
4026 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4027 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4028 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4029 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4030 4e68cba3 2019-11-23 stsp saa.repo = repo;
4032 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4033 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4034 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4038 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4039 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4040 af12c6b9 2019-06-04 stsp err = sync_err;
4042 fb399478 2019-07-12 stsp free(fileindex_path);
4043 d00136be 2019-03-26 stsp if (fileindex)
4044 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4045 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4046 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4047 d00136be 2019-03-26 stsp err = unlockerr;
4048 6c7ab921 2019-03-18 stsp return err;
4051 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4052 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4053 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4054 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4055 f2a9dc41 2019-12-13 tracey void *progress_arg;
4056 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4057 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4058 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4059 d64cc78a 2022-01-25 thomas int ignore_missing_paths;
4060 766841c2 2020-08-13 stsp const char *status_codes;
4063 f2a9dc41 2019-12-13 tracey static const struct got_error *
4064 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4065 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4066 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4067 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4069 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4070 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4071 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4072 17ed4618 2019-06-02 stsp struct stat sb;
4073 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4075 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_NONEXISTENT) {
4076 d64cc78a 2022-01-25 thomas if (a->ignore_missing_paths)
4077 d64cc78a 2022-01-25 thomas return NULL;
4078 d64cc78a 2022-01-25 thomas return got_error_set_errno(ENOENT, relpath);
4081 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4082 17ed4618 2019-06-02 stsp if (ie == NULL)
4083 d5a18ace 2022-01-25 thomas return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4085 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4086 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4087 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4088 9acbc4fa 2019-08-03 stsp return NULL;
4089 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4092 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4093 f2a9dc41 2019-12-13 tracey relpath) == -1)
4094 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4096 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4099 f2a9dc41 2019-12-13 tracey goto done;
4101 766841c2 2020-08-13 stsp if (a->status_codes) {
4102 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4104 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4105 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4108 b6b86fd1 2022-08-30 thomas if (i == ncodes) {
4109 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4110 766841c2 2020-08-13 stsp free(ondisk_path);
4111 766841c2 2020-08-13 stsp return NULL;
4113 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4114 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4115 766841c2 2020-08-13 stsp static char msg[64];
4116 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4117 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4118 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4119 766841c2 2020-08-13 stsp goto done;
4123 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4124 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4125 f2a9dc41 2019-12-13 tracey goto done;
4126 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4127 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4128 f2a9dc41 2019-12-13 tracey goto done;
4130 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4131 d64cc78a 2022-01-25 thomas err = got_error_set_errno(ENOENT, relpath);
4132 d64cc78a 2022-01-25 thomas goto done;
4134 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4135 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4136 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4137 f2a9dc41 2019-12-13 tracey goto done;
4141 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4142 20a2ad1c 2020-10-20 stsp size_t root_len;
4144 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4145 e6b88e16 2022-10-16 thomas if (unlinkat(dirfd, de_name, 0) == -1) {
4146 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4147 12463d8b 2019-12-13 stsp ondisk_path);
4148 12463d8b 2019-12-13 stsp goto done;
4150 e6b88e16 2022-10-16 thomas } else if (unlink(ondisk_path) == -1) {
4151 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4152 12463d8b 2019-12-13 stsp goto done;
4155 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4157 20a2ad1c 2020-10-20 stsp char *parent;
4158 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4160 2513f20a 2020-10-20 stsp goto done;
4161 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4162 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4163 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4164 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4165 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4166 20a2ad1c 2020-10-20 stsp ondisk_path);
4169 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4170 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4173 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4175 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4176 f2a9dc41 2019-12-13 tracey if (err)
4177 f2a9dc41 2019-12-13 tracey return err;
4178 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4179 f2a9dc41 2019-12-13 tracey return NULL;
4180 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4181 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4184 2ec1f75b 2019-03-26 stsp const struct got_error *
4185 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4186 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4187 766841c2 2020-08-13 stsp const char *status_codes,
4188 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4189 d64cc78a 2022-01-25 thomas struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4191 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4192 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4193 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4194 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4195 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4197 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4199 2ec1f75b 2019-03-26 stsp return err;
4201 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4203 2ec1f75b 2019-03-26 stsp goto done;
4205 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4206 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4207 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4208 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4209 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4210 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4211 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4212 d64cc78a 2022-01-25 thomas sda.ignore_missing_paths = ignore_missing_paths;
4213 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4215 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4216 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4217 6092c299 2021-10-04 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4221 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4222 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4223 af12c6b9 2019-06-04 stsp err = sync_err;
4225 fb399478 2019-07-12 stsp free(fileindex_path);
4226 2ec1f75b 2019-03-26 stsp if (fileindex)
4227 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4228 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4229 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4230 2ec1f75b 2019-03-26 stsp err = unlockerr;
4231 33aa809d 2019-08-08 stsp return err;
4234 33aa809d 2019-08-08 stsp static const struct got_error *
4235 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4237 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4238 33aa809d 2019-08-08 stsp char *line = NULL;
4239 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4240 33aa809d 2019-08-08 stsp ssize_t linelen;
4242 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4243 33aa809d 2019-08-08 stsp if (linelen == -1) {
4244 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4245 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4246 33aa809d 2019-08-08 stsp goto done;
4248 33aa809d 2019-08-08 stsp return NULL;
4250 33aa809d 2019-08-08 stsp if (outfile) {
4251 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4252 33aa809d 2019-08-08 stsp if (n != linelen) {
4253 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4254 33aa809d 2019-08-08 stsp goto done;
4257 33aa809d 2019-08-08 stsp if (rejectfile) {
4258 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4259 33aa809d 2019-08-08 stsp if (n != linelen)
4260 48a59395 2023-01-14 thomas err = got_ferror(rejectfile, GOT_ERR_IO);
4263 33aa809d 2019-08-08 stsp free(line);
4264 2ec1f75b 2019-03-26 stsp return err;
4267 33aa809d 2019-08-08 stsp static const struct got_error *
4268 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4270 33aa809d 2019-08-08 stsp char *line = NULL;
4271 33aa809d 2019-08-08 stsp size_t linesize = 0;
4272 33aa809d 2019-08-08 stsp ssize_t linelen;
4274 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4275 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4276 500467ff 2019-09-25 hiltjo if (ferror(f))
4277 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4278 500467ff 2019-09-25 hiltjo return NULL;
4280 33aa809d 2019-08-08 stsp free(line);
4281 33aa809d 2019-08-08 stsp return NULL;
4284 33aa809d 2019-08-08 stsp static const struct got_error *
4285 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4286 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4287 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4289 33aa809d 2019-08-08 stsp const struct got_error *err;
4291 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4292 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4293 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4295 33aa809d 2019-08-08 stsp return err;
4296 33aa809d 2019-08-08 stsp (*line_cur1)++;
4298 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4299 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4300 33aa809d 2019-08-08 stsp if (rejectfile)
4301 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4303 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4305 33aa809d 2019-08-08 stsp return err;
4306 33aa809d 2019-08-08 stsp (*line_cur2)++;
4308 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4309 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4310 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4312 33aa809d 2019-08-08 stsp return err;
4313 33aa809d 2019-08-08 stsp (*line_cur2)++;
4315 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4316 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4317 33aa809d 2019-08-08 stsp if (rejectfile)
4318 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4320 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4322 33aa809d 2019-08-08 stsp return err;
4323 33aa809d 2019-08-08 stsp (*line_cur1)++;
4326 f1e81a05 2019-08-10 stsp return NULL;
4329 f1e81a05 2019-08-10 stsp static const struct got_error *
4330 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4331 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4333 f1e81a05 2019-08-10 stsp const struct got_error *err;
4335 f1e81a05 2019-08-10 stsp if (outfile) {
4336 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4337 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4338 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4340 f1e81a05 2019-08-10 stsp return err;
4341 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4344 f1e81a05 2019-08-10 stsp if (rejectfile) {
4345 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4346 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4347 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4349 f1e81a05 2019-08-10 stsp return err;
4350 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4354 33aa809d 2019-08-08 stsp return NULL;
4357 33aa809d 2019-08-08 stsp static const struct got_error *
4358 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4359 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4360 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4361 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4362 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4364 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4365 b6b86fd1 2022-08-30 thomas struct diff_chunk_context cc = {};
4366 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4367 33aa809d 2019-08-08 stsp FILE *hunkfile;
4368 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4369 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4372 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4374 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4375 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4376 fe621944 2020-11-10 stsp start_old = cc.left.start;
4377 fe621944 2020-11-10 stsp end_old = cc.left.end;
4378 fe621944 2020-11-10 stsp start_new = cc.right.start;
4379 fe621944 2020-11-10 stsp end_new = cc.right.end;
4381 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4382 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4383 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4385 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4386 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4387 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4389 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4390 fe621944 2020-11-10 stsp if (diff_state == NULL)
4391 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4392 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4394 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4395 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4396 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4397 33aa809d 2019-08-08 stsp goto done;
4400 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4401 fe621944 2020-11-10 stsp diff_result, &cc);
4402 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4403 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4404 33aa809d 2019-08-08 stsp goto done;
4407 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4408 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4409 33aa809d 2019-08-08 stsp goto done;
4412 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4413 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4415 33aa809d 2019-08-08 stsp goto done;
4417 33aa809d 2019-08-08 stsp switch (*choice) {
4418 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4419 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4420 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4422 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4423 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4424 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4426 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4429 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4433 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4434 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4435 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4436 33aa809d 2019-08-08 stsp return err;
4439 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4440 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4441 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4442 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4443 1f1abb7e 2019-08-08 stsp void *progress_arg;
4444 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4445 33aa809d 2019-08-08 stsp void *patch_arg;
4446 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4447 10604dce 2021-09-24 thomas int unlink_added_files;
4450 e20a8b6f 2019-06-04 stsp static const struct got_error *
4451 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4452 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4453 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4454 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4455 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4457 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4458 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4459 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4460 f4ae6ddb 2022-07-01 thomas int fd = -1, fd2 = -1;
4461 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4462 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4463 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4464 fe621944 2020-11-10 stsp struct stat sb2;
4465 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4466 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4467 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4469 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4471 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4473 33aa809d 2019-08-08 stsp return err;
4475 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4476 fc63f50d 2021-12-31 thomas fd2 = openat(dirfd2, de_name2,
4477 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4478 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4479 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4480 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4481 fa3cef63 2020-07-23 stsp goto done;
4483 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4484 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4485 48b4f239 2021-12-31 thomas if (link_len == -1) {
4486 48b4f239 2021-12-31 thomas return got_error_from_errno2("readlinkat",
4489 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4490 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4493 06340621 2021-12-31 thomas fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4494 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4495 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4496 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4497 fa3cef63 2020-07-23 stsp goto done;
4499 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4500 fa3cef63 2020-07-23 stsp sizeof(link_target));
4501 fa3cef63 2020-07-23 stsp if (link_len == -1)
4502 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4503 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4504 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4507 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4508 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4509 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4510 fa3cef63 2020-07-23 stsp goto done;
4513 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4514 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4515 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4516 fa3cef63 2020-07-23 stsp goto done;
4521 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4522 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4523 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4524 fa3cef63 2020-07-23 stsp goto done;
4526 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4527 fa3cef63 2020-07-23 stsp if (n != link_len) {
4528 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4529 fa3cef63 2020-07-23 stsp goto done;
4531 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4532 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4533 fa3cef63 2020-07-23 stsp goto done;
4535 fa3cef63 2020-07-23 stsp rewind(f2);
4538 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
4539 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
4540 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
4541 f4ae6ddb 2022-07-01 thomas goto done;
4544 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4546 33aa809d 2019-08-08 stsp goto done;
4548 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4550 33aa809d 2019-08-08 stsp goto done;
4552 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4554 33aa809d 2019-08-08 stsp goto done;
4556 dd2e2f52 2022-07-01 thomas err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4557 25ec7006 2022-07-01 thomas 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4559 33aa809d 2019-08-08 stsp goto done;
4561 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4564 33aa809d 2019-08-08 stsp goto done;
4566 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4567 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4568 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4569 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4571 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4572 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4573 b6b86fd1 2022-08-30 thomas struct diff_chunk_context cc = {};
4574 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4575 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4576 fe621944 2020-11-10 stsp nchanges++;
4578 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4579 33aa809d 2019-08-08 stsp int choice;
4580 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4581 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4582 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4583 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4584 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4585 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4587 33aa809d 2019-08-08 stsp goto done;
4588 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4589 33aa809d 2019-08-08 stsp have_content = 1;
4590 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4593 1ebedb77 2019-10-19 stsp if (have_content) {
4594 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4595 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4596 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4598 1ebedb77 2019-10-19 stsp goto done;
4600 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4601 a2c162eb 2022-10-30 thomas mode_t mode;
4603 a2c162eb 2022-10-30 thomas mode = apply_umask(sb2.st_mode);
4604 a2c162eb 2022-10-30 thomas if (fchmod(fileno(outfile), mode) == -1) {
4605 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4606 fa3cef63 2020-07-23 stsp goto done;
4611 33aa809d 2019-08-08 stsp free(id_str);
4612 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
4613 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
4615 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4616 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4617 fe621944 2020-11-10 stsp if (err == NULL)
4618 fe621944 2020-11-10 stsp err = free_err;
4619 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4620 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4621 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4622 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4623 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4624 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4625 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4626 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4627 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4628 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4629 33aa809d 2019-08-08 stsp if (err || !have_content) {
4630 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4631 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4632 33aa809d 2019-08-08 stsp free(*path_outfile);
4633 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4635 33aa809d 2019-08-08 stsp free(path1);
4636 33aa809d 2019-08-08 stsp return err;
4639 33aa809d 2019-08-08 stsp static const struct got_error *
4640 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4641 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4642 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4643 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4645 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4646 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4647 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4648 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4649 945f9229 2022-04-16 thomas struct got_commit_object *base_commit = NULL;
4650 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4651 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4652 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4653 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4654 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4655 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4656 f4ae6ddb 2022-07-01 thomas int fd = -1;
4658 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4659 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4660 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4661 d3bcc3d1 2019-08-08 stsp return NULL;
4663 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4664 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4665 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4667 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4668 65084dad 2019-08-08 stsp if (ie == NULL)
4669 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4671 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4672 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4673 a129376b 2019-03-28 stsp if (err) {
4674 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4675 a129376b 2019-03-28 stsp goto done;
4676 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4677 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4678 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4679 e20a8b6f 2019-06-04 stsp goto done;
4682 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4683 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4684 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4685 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4686 a129376b 2019-03-28 stsp goto done;
4689 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4690 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4691 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4692 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4693 a129376b 2019-03-28 stsp goto done;
4696 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4697 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4698 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4699 a129376b 2019-03-28 stsp goto done;
4704 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&base_commit, a->repo,
4705 945f9229 2022-04-16 thomas a->worktree->base_commit_id);
4706 945f9229 2022-04-16 thomas if (err)
4707 945f9229 2022-04-16 thomas goto done;
4709 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4710 a9fa2909 2019-07-27 stsp if (err) {
4711 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4712 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4713 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4714 a9fa2909 2019-07-27 stsp goto done;
4716 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4718 a9fa2909 2019-07-27 stsp goto done;
4720 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4722 a9fa2909 2019-07-27 stsp goto done;
4724 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4725 1233e6b6 2020-10-19 stsp free(te_name);
4726 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4727 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4728 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4729 a9fa2909 2019-07-27 stsp goto done;
4733 a129376b 2019-03-28 stsp switch (status) {
4734 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4735 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4736 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4737 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4738 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4740 33aa809d 2019-08-08 stsp goto done;
4741 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4744 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4745 1f1abb7e 2019-08-08 stsp ie->path);
4747 1ee397ad 2019-07-12 stsp goto done;
4748 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4749 10604dce 2021-09-24 thomas if (a->unlink_added_files) {
4750 10604dce 2021-09-24 thomas if (asprintf(&ondisk_path, "%s/%s",
4751 10604dce 2021-09-24 thomas got_worktree_get_root_path(a->worktree),
4752 10604dce 2021-09-24 thomas relpath) == -1) {
4753 10604dce 2021-09-24 thomas err = got_error_from_errno("asprintf");
4754 10604dce 2021-09-24 thomas goto done;
4756 10604dce 2021-09-24 thomas if (unlink(ondisk_path) == -1) {
4757 10604dce 2021-09-24 thomas err = got_error_from_errno2("unlink",
4758 10604dce 2021-09-24 thomas ondisk_path);
4763 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4764 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4765 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4766 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4767 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4769 33aa809d 2019-08-08 stsp goto done;
4770 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4773 33aa809d 2019-08-08 stsp /* fall through */
4774 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4775 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4776 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4777 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4778 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4779 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4780 43010591 2023-02-17 thomas staged_status == GOT_STATUS_MODIFY)
4781 43010591 2023-02-17 thomas got_fileindex_entry_get_staged_blob_id(&id, ie);
4783 43010591 2023-02-17 thomas got_fileindex_entry_get_blob_id(&id, ie);
4784 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
4785 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
4786 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
4787 f4ae6ddb 2022-07-01 thomas goto done;
4790 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4792 65084dad 2019-08-08 stsp goto done;
4794 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4795 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4796 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4797 a129376b 2019-03-28 stsp goto done;
4800 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4801 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4802 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4803 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4804 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4805 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4806 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4808 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4809 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4810 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4811 369fd7e5 2020-07-23 stsp path_content);
4814 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4815 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4816 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4817 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4819 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4820 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4821 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4822 369fd7e5 2020-07-23 stsp goto done;
4826 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4827 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4828 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4829 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4830 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4831 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4833 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4835 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4836 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4837 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4838 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4841 a129376b 2019-03-28 stsp goto done;
4842 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4843 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4844 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4845 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4846 437adc9d 2020-12-10 yzhong blob->id.sha1,
4847 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4849 2e1fa222 2020-07-23 stsp goto done;
4851 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4852 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4853 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4862 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4863 33aa809d 2019-08-08 stsp free(path_content);
4864 e20a8b6f 2019-06-04 stsp free(parent_path);
4865 a129376b 2019-03-28 stsp free(tree_path);
4866 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
4867 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
4869 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4871 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4872 a129376b 2019-03-28 stsp free(tree_id);
4873 945f9229 2022-04-16 thomas if (base_commit)
4874 945f9229 2022-04-16 thomas got_object_commit_close(base_commit);
4875 e20a8b6f 2019-06-04 stsp return err;
4878 e20a8b6f 2019-06-04 stsp const struct got_error *
4879 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4880 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4881 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4882 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4883 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4885 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4886 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4887 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4888 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4889 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4890 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4892 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4894 e20a8b6f 2019-06-04 stsp return err;
4896 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4898 e20a8b6f 2019-06-04 stsp goto done;
4900 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4901 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4902 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4903 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4904 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4905 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4906 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4907 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
4908 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4909 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4910 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
4914 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4915 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4916 e20a8b6f 2019-06-04 stsp err = sync_err;
4918 fb399478 2019-07-12 stsp free(fileindex_path);
4919 a129376b 2019-03-28 stsp if (fileindex)
4920 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4921 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4922 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4923 a129376b 2019-03-28 stsp err = unlockerr;
4924 c4296144 2019-05-09 stsp return err;
4927 cf066bf8 2019-05-09 stsp static void
4928 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4930 24519714 2019-05-09 stsp free(ct->path);
4931 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4932 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4933 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4934 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4935 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4936 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4940 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4941 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4942 24519714 2019-05-09 stsp struct got_repository *repo;
4943 24519714 2019-05-09 stsp struct got_worktree *worktree;
4944 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4945 5f8a88c6 2019-08-03 stsp int have_staged_files;
4946 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4947 ef899790 2022-11-01 thomas int diff_header_shown;
4948 ef899790 2022-11-01 thomas FILE *diff_outfile;
4949 ef899790 2022-11-01 thomas FILE *f1;
4950 ef899790 2022-11-01 thomas FILE *f2;
4954 ef899790 2022-11-01 thomas * Create a file which contains the target path of a symlink so we can feed
4955 ef899790 2022-11-01 thomas * it as content to the diff engine.
4957 ef899790 2022-11-01 thomas static const struct got_error *
4958 ef899790 2022-11-01 thomas get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4959 ef899790 2022-11-01 thomas const char *abspath)
4961 ef899790 2022-11-01 thomas const struct got_error *err = NULL;
4962 ef899790 2022-11-01 thomas char target_path[PATH_MAX];
4963 ef899790 2022-11-01 thomas ssize_t target_len, outlen;
4965 ef899790 2022-11-01 thomas *fd = -1;
4967 ef899790 2022-11-01 thomas if (dirfd != -1) {
4968 ef899790 2022-11-01 thomas target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4969 ef899790 2022-11-01 thomas if (target_len == -1)
4970 ef899790 2022-11-01 thomas return got_error_from_errno2("readlinkat", abspath);
4971 ef899790 2022-11-01 thomas } else {
4972 ef899790 2022-11-01 thomas target_len = readlink(abspath, target_path, PATH_MAX);
4973 ef899790 2022-11-01 thomas if (target_len == -1)
4974 ef899790 2022-11-01 thomas return got_error_from_errno2("readlink", abspath);
4977 ef899790 2022-11-01 thomas *fd = got_opentempfd();
4978 ef899790 2022-11-01 thomas if (*fd == -1)
4979 ef899790 2022-11-01 thomas return got_error_from_errno("got_opentempfd");
4981 ef899790 2022-11-01 thomas outlen = write(*fd, target_path, target_len);
4982 ef899790 2022-11-01 thomas if (outlen == -1) {
4983 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
4984 ef899790 2022-11-01 thomas goto done;
4987 ef899790 2022-11-01 thomas if (lseek(*fd, 0, SEEK_SET) == -1) {
4988 ef899790 2022-11-01 thomas err = got_error_from_errno2("lseek", abspath);
4989 ef899790 2022-11-01 thomas goto done;
4992 ef899790 2022-11-01 thomas if (err) {
4993 ef899790 2022-11-01 thomas close(*fd);
4994 ef899790 2022-11-01 thomas *fd = -1;
4996 ef899790 2022-11-01 thomas return err;
4999 ef899790 2022-11-01 thomas static const struct got_error *
5000 ef899790 2022-11-01 thomas append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5001 ef899790 2022-11-01 thomas FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5002 b5bedbbb 2022-11-01 thomas int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5004 ef899790 2022-11-01 thomas const struct got_error *err = NULL;
5005 ef899790 2022-11-01 thomas struct got_blob_object *blob1 = NULL;
5006 ef899790 2022-11-01 thomas int fd = -1, fd1 = -1, fd2 = -1;
5007 ef899790 2022-11-01 thomas FILE *ondisk_file = NULL;
5008 ef899790 2022-11-01 thomas char *label1 = NULL;
5009 ef899790 2022-11-01 thomas struct stat sb;
5010 ef899790 2022-11-01 thomas off_t size1 = 0;
5011 ef899790 2022-11-01 thomas int f2_exists = 0;
5012 ef899790 2022-11-01 thomas char *id_str = NULL;
5014 ef899790 2022-11-01 thomas memset(&sb, 0, sizeof(sb));
5016 d259e491 2022-11-01 thomas if (diff_staged) {
5017 d259e491 2022-11-01 thomas if (ct->staged_status != GOT_STATUS_MODIFY &&
5018 d259e491 2022-11-01 thomas ct->staged_status != GOT_STATUS_ADD &&
5019 d259e491 2022-11-01 thomas ct->staged_status != GOT_STATUS_DELETE)
5020 d259e491 2022-11-01 thomas return NULL;
5021 d259e491 2022-11-01 thomas } else {
5022 d259e491 2022-11-01 thomas if (ct->status != GOT_STATUS_MODIFY &&
5023 d259e491 2022-11-01 thomas ct->status != GOT_STATUS_ADD &&
5024 d259e491 2022-11-01 thomas ct->status != GOT_STATUS_DELETE)
5025 d259e491 2022-11-01 thomas return NULL;
5028 ef899790 2022-11-01 thomas err = got_opentemp_truncate(f1);
5029 ef899790 2022-11-01 thomas if (err)
5030 ef899790 2022-11-01 thomas return got_error_from_errno("got_opentemp_truncate");
5031 ef899790 2022-11-01 thomas err = got_opentemp_truncate(f2);
5032 ef899790 2022-11-01 thomas if (err)
5033 ef899790 2022-11-01 thomas return got_error_from_errno("got_opentemp_truncate");
5035 ef899790 2022-11-01 thomas if (!*diff_header_shown) {
5036 ef899790 2022-11-01 thomas err = got_object_id_str(&id_str, worktree->base_commit_id);
5037 ef899790 2022-11-01 thomas if (err)
5038 ef899790 2022-11-01 thomas return err;
5039 ef899790 2022-11-01 thomas fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5040 ef899790 2022-11-01 thomas got_worktree_get_root_path(worktree));
5041 ef899790 2022-11-01 thomas fprintf(diff_outfile, "commit - %s\n", id_str);
5042 ef899790 2022-11-01 thomas fprintf(diff_outfile, "path + %s%s\n",
5043 ef899790 2022-11-01 thomas got_worktree_get_root_path(worktree),
5044 ef899790 2022-11-01 thomas diff_staged ? " (staged changes)" : "");
5045 ef899790 2022-11-01 thomas *diff_header_shown = 1;
5048 ef899790 2022-11-01 thomas if (diff_staged) {
5049 ef899790 2022-11-01 thomas const char *label1 = NULL, *label2 = NULL;
5050 ef899790 2022-11-01 thomas switch (ct->staged_status) {
5051 ef899790 2022-11-01 thomas case GOT_STATUS_MODIFY:
5052 ef899790 2022-11-01 thomas label1 = ct->path;
5053 ef899790 2022-11-01 thomas label2 = ct->path;
5055 ef899790 2022-11-01 thomas case GOT_STATUS_ADD:
5056 ef899790 2022-11-01 thomas label2 = ct->path;
5058 ef899790 2022-11-01 thomas case GOT_STATUS_DELETE:
5059 ef899790 2022-11-01 thomas label1 = ct->path;
5061 ef899790 2022-11-01 thomas default:
5062 ef899790 2022-11-01 thomas return got_error(GOT_ERR_FILE_STATUS);
5064 ef899790 2022-11-01 thomas fd1 = got_opentempfd();
5065 ef899790 2022-11-01 thomas if (fd1 == -1) {
5066 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
5067 ef899790 2022-11-01 thomas goto done;
5069 ef899790 2022-11-01 thomas fd2 = got_opentempfd();
5070 ef899790 2022-11-01 thomas if (fd2 == -1) {
5071 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
5072 ef899790 2022-11-01 thomas goto done;
5074 ef899790 2022-11-01 thomas err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5075 ef899790 2022-11-01 thomas fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5076 be97ab03 2023-01-19 thomas label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5077 53d03f97 2023-01-10 thomas NULL, repo, diff_outfile);
5078 ef899790 2022-11-01 thomas goto done;
5081 ef899790 2022-11-01 thomas fd1 = got_opentempfd();
5082 ef899790 2022-11-01 thomas if (fd1 == -1) {
5083 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
5084 ef899790 2022-11-01 thomas goto done;
5087 ef899790 2022-11-01 thomas if (ct->status != GOT_STATUS_ADD) {
5088 ef899790 2022-11-01 thomas err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5089 ef899790 2022-11-01 thomas 8192, fd1);
5090 ef899790 2022-11-01 thomas if (err)
5091 ef899790 2022-11-01 thomas goto done;
5094 ef899790 2022-11-01 thomas if (ct->status != GOT_STATUS_DELETE) {
5095 ef899790 2022-11-01 thomas if (dirfd != -1) {
5096 ef899790 2022-11-01 thomas fd = openat(dirfd, de_name,
5097 ef899790 2022-11-01 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5098 ef899790 2022-11-01 thomas if (fd == -1) {
5099 ef899790 2022-11-01 thomas if (!got_err_open_nofollow_on_symlink()) {
5100 ef899790 2022-11-01 thomas err = got_error_from_errno2("openat",
5101 ef899790 2022-11-01 thomas ct->ondisk_path);
5102 ef899790 2022-11-01 thomas goto done;
5104 ef899790 2022-11-01 thomas err = get_symlink_target_file(&fd, dirfd,
5105 ef899790 2022-11-01 thomas de_name, ct->ondisk_path);
5106 ef899790 2022-11-01 thomas if (err)
5107 ef899790 2022-11-01 thomas goto done;
5109 ef899790 2022-11-01 thomas } else {
5110 ef899790 2022-11-01 thomas fd = open(ct->ondisk_path,
5111 ef899790 2022-11-01 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5112 ef899790 2022-11-01 thomas if (fd == -1) {
5113 ef899790 2022-11-01 thomas if (!got_err_open_nofollow_on_symlink()) {
5114 ef899790 2022-11-01 thomas err = got_error_from_errno2("open",
5115 ef899790 2022-11-01 thomas ct->ondisk_path);
5116 ef899790 2022-11-01 thomas goto done;
5118 ef899790 2022-11-01 thomas err = get_symlink_target_file(&fd, dirfd,
5119 ef899790 2022-11-01 thomas de_name, ct->ondisk_path);
5120 ef899790 2022-11-01 thomas if (err)
5121 ef899790 2022-11-01 thomas goto done;
5124 ef899790 2022-11-01 thomas if (fstatat(fd, ct->ondisk_path, &sb,
5125 ef899790 2022-11-01 thomas AT_SYMLINK_NOFOLLOW) == -1) {
5126 ef899790 2022-11-01 thomas err = got_error_from_errno2("fstatat", ct->ondisk_path);
5127 ef899790 2022-11-01 thomas goto done;
5129 ef899790 2022-11-01 thomas ondisk_file = fdopen(fd, "r");
5130 ef899790 2022-11-01 thomas if (ondisk_file == NULL) {
5131 ef899790 2022-11-01 thomas err = got_error_from_errno2("fdopen", ct->ondisk_path);
5132 ef899790 2022-11-01 thomas goto done;
5134 ef899790 2022-11-01 thomas fd = -1;
5135 ef899790 2022-11-01 thomas f2_exists = 1;
5138 ef899790 2022-11-01 thomas if (blob1) {
5139 ef899790 2022-11-01 thomas err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5140 ef899790 2022-11-01 thomas f1, blob1);
5141 ef899790 2022-11-01 thomas if (err)
5142 ef899790 2022-11-01 thomas goto done;
5145 ef899790 2022-11-01 thomas err = got_diff_blob_file(blob1, f1, size1, label1,
5146 ef899790 2022-11-01 thomas ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5147 be97ab03 2023-01-19 thomas GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5149 ef899790 2022-11-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5150 ef899790 2022-11-01 thomas err = got_error_from_errno("close");
5151 ef899790 2022-11-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5152 ef899790 2022-11-01 thomas err = got_error_from_errno("close");
5153 ef899790 2022-11-01 thomas if (blob1)
5154 ef899790 2022-11-01 thomas got_object_blob_close(blob1);
5155 ef899790 2022-11-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
5156 ef899790 2022-11-01 thomas err = got_error_from_errno("close");
5157 ef899790 2022-11-01 thomas if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5158 ef899790 2022-11-01 thomas err = got_error_from_errno("fclose");
5159 ef899790 2022-11-01 thomas return err;
5162 c4296144 2019-05-09 stsp static const struct got_error *
5163 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
5164 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
5165 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5166 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
5168 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
5169 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
5170 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5171 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
5172 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
5173 768aea60 2019-05-09 stsp struct stat sb;
5175 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
5176 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
5177 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
5178 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5179 5f8a88c6 2019-08-03 stsp return NULL;
5181 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
5182 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
5184 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
5185 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
5186 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
5187 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
5188 5f8a88c6 2019-08-03 stsp return NULL;
5191 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
5192 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5193 036813ee 2019-05-09 stsp goto done;
5195 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
5196 036813ee 2019-05-09 stsp parent_path = strdup("");
5197 69960a46 2019-05-09 stsp if (parent_path == NULL)
5198 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
5200 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
5202 69960a46 2019-05-09 stsp return err;
5205 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
5206 cf066bf8 2019-05-09 stsp if (ct == NULL) {
5207 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
5208 c4296144 2019-05-09 stsp goto done;
5211 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5212 768aea60 2019-05-09 stsp relpath) == -1) {
5213 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5214 768aea60 2019-05-09 stsp goto done;
5217 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
5218 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
5219 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
5220 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5221 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
5222 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
5223 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
5224 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
5226 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
5227 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
5230 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5231 0aeb8099 2020-07-23 stsp goto done;
5233 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
5234 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
5235 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
5236 12463d8b 2019-12-13 stsp if (dirfd != -1) {
5237 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
5238 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5239 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
5240 12463d8b 2019-12-13 stsp ct->ondisk_path);
5241 12463d8b 2019-12-13 stsp goto done;
5243 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
5244 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
5245 768aea60 2019-05-09 stsp goto done;
5247 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5250 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5251 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5252 44d03001 2019-05-09 stsp relpath) == -1) {
5253 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5254 44d03001 2019-05-09 stsp goto done;
5257 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5258 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5259 35213c7c 2020-07-23 stsp int is_bad_symlink;
5260 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5261 35213c7c 2020-07-23 stsp ssize_t target_len;
5262 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5263 35213c7c 2020-07-23 stsp sizeof(target_path));
5264 35213c7c 2020-07-23 stsp if (target_len == -1) {
5265 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5266 35213c7c 2020-07-23 stsp ct->ondisk_path);
5267 35213c7c 2020-07-23 stsp goto done;
5269 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5270 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5272 35213c7c 2020-07-23 stsp goto done;
5273 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5274 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5275 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5276 35213c7c 2020-07-23 stsp goto done;
5281 cf066bf8 2019-05-09 stsp ct->status = status;
5282 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5283 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5284 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5285 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5286 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5287 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5288 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5289 b416585c 2019-05-13 stsp goto done;
5291 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5292 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5293 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5294 f0b75401 2019-08-03 stsp goto done;
5297 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5298 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5299 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5300 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5301 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5302 036813ee 2019-05-09 stsp goto done;
5305 24519714 2019-05-09 stsp ct->path = strdup(path);
5306 24519714 2019-05-09 stsp if (ct->path == NULL) {
5307 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5308 24519714 2019-05-09 stsp goto done;
5310 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5311 ef899790 2022-11-01 thomas if (err)
5312 ef899790 2022-11-01 thomas goto done;
5314 ef899790 2022-11-01 thomas if (a->diff_outfile && ct && new != NULL) {
5315 ef899790 2022-11-01 thomas err = append_ct_diff(ct, &a->diff_header_shown,
5316 ef899790 2022-11-01 thomas a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5317 b5bedbbb 2022-11-01 thomas a->have_staged_files, a->repo, a->worktree);
5318 ef899790 2022-11-01 thomas if (err)
5319 ef899790 2022-11-01 thomas goto done;
5322 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5323 ed175427 2019-05-09 stsp free_commitable(ct);
5324 24519714 2019-05-09 stsp free(parent_path);
5325 036813ee 2019-05-09 stsp free(path);
5326 a129376b 2019-03-28 stsp return err;
5329 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5330 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5331 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5332 036813ee 2019-05-09 stsp struct got_repository *);
5334 ed175427 2019-05-09 stsp static const struct got_error *
5335 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5336 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5337 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5338 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5339 afa376bf 2019-05-09 stsp struct got_repository *repo)
5341 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5342 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5343 036813ee 2019-05-09 stsp char *subpath;
5345 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5346 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5347 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5349 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5351 ed175427 2019-05-09 stsp return err;
5353 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5354 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5355 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5356 036813ee 2019-05-09 stsp free(subpath);
5357 036813ee 2019-05-09 stsp return err;
5360 036813ee 2019-05-09 stsp static const struct got_error *
5361 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5363 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5364 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5366 036813ee 2019-05-09 stsp *match = 0;
5368 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5369 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5370 0f63689d 2019-05-10 stsp return NULL;
5373 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5375 0f63689d 2019-05-10 stsp return err;
5376 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5377 036813ee 2019-05-09 stsp free(ct_parent_path);
5378 036813ee 2019-05-09 stsp return err;
5381 768aea60 2019-05-09 stsp static mode_t
5382 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5384 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5385 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5387 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5390 036813ee 2019-05-09 stsp static const struct got_error *
5391 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5392 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5394 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5396 036813ee 2019-05-09 stsp *new_te = NULL;
5398 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5400 036813ee 2019-05-09 stsp goto done;
5402 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5404 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5405 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5406 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5408 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5410 036813ee 2019-05-09 stsp if (err && *new_te) {
5411 56e0773d 2019-11-28 stsp free(*new_te);
5412 036813ee 2019-05-09 stsp *new_te = NULL;
5414 036813ee 2019-05-09 stsp return err;
5417 036813ee 2019-05-09 stsp static const struct got_error *
5418 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5419 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5421 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5422 102b254e 2020-10-19 stsp char *ct_name = NULL;
5424 036813ee 2019-05-09 stsp *new_te = NULL;
5426 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5427 036813ee 2019-05-09 stsp if (*new_te == NULL)
5428 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5430 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5432 036813ee 2019-05-09 stsp goto done;
5433 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5434 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5435 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5436 036813ee 2019-05-09 stsp goto done;
5439 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5441 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5442 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5443 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5445 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5447 102b254e 2020-10-19 stsp free(ct_name);
5448 036813ee 2019-05-09 stsp if (err && *new_te) {
5449 56e0773d 2019-11-28 stsp free(*new_te);
5450 036813ee 2019-05-09 stsp *new_te = NULL;
5452 036813ee 2019-05-09 stsp return err;
5455 036813ee 2019-05-09 stsp static const struct got_error *
5456 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5457 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5459 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5460 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5462 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5464 036813ee 2019-05-09 stsp return err;
5465 036813ee 2019-05-09 stsp if (new_pe == NULL)
5466 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5467 036813ee 2019-05-09 stsp return NULL;
5470 afa376bf 2019-05-09 stsp static const struct got_error *
5471 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5472 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5474 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5475 5f8a88c6 2019-08-03 stsp unsigned char status;
5477 ae1e948a 2021-09-28 thomas if (status_cb == NULL) /* no commit progress output desired */
5478 ae1e948a 2021-09-28 thomas return NULL;
5480 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5481 afa376bf 2019-05-09 stsp ct_path++;
5483 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5484 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5486 5f8a88c6 2019-08-03 stsp status = ct->status;
5488 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5489 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5492 036813ee 2019-05-09 stsp static const struct got_error *
5493 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5494 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5496 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5497 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5498 44d03001 2019-05-09 stsp char *te_path;
5500 44d03001 2019-05-09 stsp *modified = 0;
5502 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5503 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5504 44d03001 2019-05-09 stsp te->name) == -1)
5505 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5507 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5508 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5509 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5510 44d03001 2019-05-09 stsp strlen(te_path));
5511 62d463ca 2020-10-20 naddy if (*modified)
5515 44d03001 2019-05-09 stsp free(te_path);
5516 44d03001 2019-05-09 stsp return err;
5519 44d03001 2019-05-09 stsp static const struct got_error *
5520 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5521 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5522 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5524 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5525 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5527 036813ee 2019-05-09 stsp *ctp = NULL;
5529 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5530 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5531 036813ee 2019-05-09 stsp char *ct_name = NULL;
5532 036813ee 2019-05-09 stsp int path_matches;
5534 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5535 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5536 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5537 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5540 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5541 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5545 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5548 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5550 036813ee 2019-05-09 stsp return err;
5551 036813ee 2019-05-09 stsp if (!path_matches)
5554 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5556 d34b633e 2020-10-19 stsp return err;
5558 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5559 d34b633e 2020-10-19 stsp free(ct_name);
5562 d34b633e 2020-10-19 stsp free(ct_name);
5564 036813ee 2019-05-09 stsp *ctp = ct;
5568 2b496619 2019-07-10 stsp return err;
5571 2b496619 2019-07-10 stsp static const struct got_error *
5572 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5573 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5574 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5575 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5576 2b496619 2019-07-10 stsp struct got_repository *repo)
5578 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5579 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5580 2b496619 2019-07-10 stsp char *subtree_path;
5581 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5582 ba580f68 2020-03-22 stsp int nentries;
5584 2b496619 2019-07-10 stsp *new_tep = NULL;
5586 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5587 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5588 2b496619 2019-07-10 stsp child_path) == -1)
5589 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5591 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5592 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5593 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5594 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5596 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5597 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5598 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5599 2b496619 2019-07-10 stsp goto done;
5601 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5602 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5603 2b496619 2019-07-10 stsp if (err) {
5604 56e0773d 2019-11-28 stsp free(new_te);
5605 2b496619 2019-07-10 stsp goto done;
5607 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5610 2b496619 2019-07-10 stsp free(subtree_path);
5611 2b496619 2019-07-10 stsp if (err == NULL)
5612 2b496619 2019-07-10 stsp *new_tep = new_te;
5613 036813ee 2019-05-09 stsp return err;
5616 036813ee 2019-05-09 stsp static const struct got_error *
5617 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5618 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5619 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5620 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5621 036813ee 2019-05-09 stsp struct got_repository *repo)
5623 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5624 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5625 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5626 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5628 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5629 ba580f68 2020-03-22 stsp *nentries = 0;
5631 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5632 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5633 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5634 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5636 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5637 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5638 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5641 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5642 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5645 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5646 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5648 036813ee 2019-05-09 stsp goto done;
5650 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5651 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5652 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5654 036813ee 2019-05-09 stsp goto done;
5655 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5657 afa376bf 2019-05-09 stsp goto done;
5658 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5659 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5661 2f51b5b3 2019-05-09 stsp goto done;
5662 ba580f68 2020-03-22 stsp (*nentries)++;
5664 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5665 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5666 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5667 2b496619 2019-07-10 stsp == NULL) {
5668 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5669 2b496619 2019-07-10 stsp child_path, path_base_tree,
5670 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5673 2b496619 2019-07-10 stsp goto done;
5674 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5676 2b496619 2019-07-10 stsp goto done;
5677 ba580f68 2020-03-22 stsp (*nentries)++;
5682 2f51b5b3 2019-05-09 stsp if (base_tree) {
5683 56e0773d 2019-11-28 stsp int i, nbase_entries;
5684 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5685 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5686 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5687 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5689 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5690 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5691 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5692 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5694 63c5ca5d 2019-08-24 stsp goto done;
5695 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5697 63c5ca5d 2019-08-24 stsp goto done;
5698 ba580f68 2020-03-22 stsp (*nentries)++;
5702 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5703 44d03001 2019-05-09 stsp int modified;
5704 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5706 036813ee 2019-05-09 stsp goto done;
5707 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5708 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5710 2f51b5b3 2019-05-09 stsp goto done;
5711 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5712 44d03001 2019-05-09 stsp if (modified) {
5713 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5714 ba580f68 2020-03-22 stsp int nsubentries;
5715 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5716 ba580f68 2020-03-22 stsp &nsubentries, te,
5717 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5718 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5720 44d03001 2019-05-09 stsp goto done;
5721 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5722 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5723 ba580f68 2020-03-22 stsp free(new_id);
5726 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5727 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5728 56e0773d 2019-11-28 stsp free(new_id);
5730 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5732 036813ee 2019-05-09 stsp goto done;
5733 ba580f68 2020-03-22 stsp (*nentries)++;
5737 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5738 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5740 f66c734c 2019-09-22 stsp goto done;
5742 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5743 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5744 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5745 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5746 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5747 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5749 2f51b5b3 2019-05-09 stsp goto done;
5750 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5752 2f51b5b3 2019-05-09 stsp goto done;
5753 ba580f68 2020-03-22 stsp (*nentries)++;
5755 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5756 b416585c 2019-05-13 stsp status_arg);
5758 afa376bf 2019-05-09 stsp goto done;
5760 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5761 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5763 2f51b5b3 2019-05-09 stsp goto done;
5764 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5766 2f51b5b3 2019-05-09 stsp goto done;
5767 ba580f68 2020-03-22 stsp (*nentries)++;
5772 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5773 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5775 21c2d8be 2023-01-10 thomas got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5776 2e1fa222 2020-07-23 stsp return err;
5779 2e1fa222 2020-07-23 stsp static const struct got_error *
5780 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5781 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5782 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5783 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5785 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5786 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5787 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5789 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5790 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5791 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5793 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5795 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5796 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5797 437adc9d 2020-12-10 yzhong if (err)
5798 437adc9d 2020-12-10 yzhong goto done;
5801 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5802 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5803 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5804 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5805 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5806 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5807 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5808 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5810 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5811 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5812 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5813 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5814 72fd46fa 2019-09-06 stsp !have_staged_files);
5816 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5817 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5818 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5819 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5820 72fd46fa 2019-09-06 stsp !have_staged_files);
5822 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5824 437adc9d 2020-12-10 yzhong goto done;
5825 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5826 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5827 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5828 3969253a 2020-03-07 stsp if (err) {
5829 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5830 437adc9d 2020-12-10 yzhong goto done;
5832 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5833 3969253a 2020-03-07 stsp if (err) {
5834 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5835 437adc9d 2020-12-10 yzhong goto done;
5838 437adc9d 2020-12-10 yzhong free(relpath);
5839 437adc9d 2020-12-10 yzhong relpath = NULL;
5842 437adc9d 2020-12-10 yzhong free(relpath);
5843 d56d26ce 2019-05-10 stsp return err;
5847 d56d26ce 2019-05-10 stsp static const struct got_error *
5848 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5849 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5850 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5851 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5852 735ef5ac 2019-08-03 stsp int ood_errcode)
5854 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5855 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
5856 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5858 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5859 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5860 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5861 1a36436d 2019-06-10 stsp return NULL;
5863 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5864 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5866 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, head_commit_id);
5867 945f9229 2022-04-16 thomas if (err)
5868 945f9229 2022-04-16 thomas goto done;
5869 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5870 9bead371 2019-07-28 stsp if (err) {
5871 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5872 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5873 1a36436d 2019-06-10 stsp goto done;
5874 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5875 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5877 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5878 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, head_commit_id);
5879 945f9229 2022-04-16 thomas if (err)
5880 945f9229 2022-04-16 thomas goto done;
5881 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5882 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5883 1a36436d 2019-06-10 stsp goto done;
5884 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5888 945f9229 2022-04-16 thomas if (commit)
5889 945f9229 2022-04-16 thomas got_object_commit_close(commit);
5890 1a36436d 2019-06-10 stsp return err;
5893 ef20f542 2022-06-26 thomas static const struct got_error *
5894 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5895 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5896 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id,
5897 10604dce 2021-09-24 thomas struct got_object_id *parent_id2,
5898 10604dce 2021-09-24 thomas struct got_worktree *worktree,
5899 ef899790 2022-11-01 thomas const char *author, const char *committer, char *diff_path,
5900 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5901 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5902 afa376bf 2019-05-09 stsp struct got_repository *repo)
5904 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5905 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5906 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5907 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5908 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5909 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5910 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5911 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5912 10604dce 2021-09-24 thomas int nentries, nparents = 0;
5913 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5914 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5915 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5916 892eab0a 2022-07-22 thomas time_t timestamp;
5918 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5920 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5922 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5924 588edf97 2019-05-10 stsp goto done;
5926 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5928 588edf97 2019-05-10 stsp goto done;
5930 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5931 ef899790 2022-11-01 thomas err = commit_msg_cb(commitable_paths, diff_path,
5932 ef899790 2022-11-01 thomas &logmsg, commit_arg);
5937 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5938 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5942 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5943 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5944 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5945 cf066bf8 2019-05-09 stsp char *ondisk_path;
5947 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5948 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5949 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5952 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5953 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5954 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5957 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5958 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5959 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5960 cf066bf8 2019-05-09 stsp goto done;
5962 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5963 2e1fa222 2020-07-23 stsp free(ondisk_path);
5965 cf066bf8 2019-05-09 stsp goto done;
5968 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5969 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5970 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5972 036813ee 2019-05-09 stsp goto done;
5974 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5976 de18fc63 2019-05-09 stsp goto done;
5977 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5978 10604dce 2021-09-24 thomas nparents++;
5979 10604dce 2021-09-24 thomas if (parent_id2) {
5980 10604dce 2021-09-24 thomas err = got_object_qid_alloc(&pid, parent_id2);
5981 10604dce 2021-09-24 thomas if (err)
5982 10604dce 2021-09-24 thomas goto done;
5983 10604dce 2021-09-24 thomas STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5984 10604dce 2021-09-24 thomas nparents++;
5986 892eab0a 2022-07-22 thomas timestamp = time(NULL);
5987 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5988 892eab0a 2022-07-22 thomas nparents, author, timestamp, committer, timestamp, logmsg, repo);
5989 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5990 33ad4cbe 2019-05-12 jcs free(logmsg);
5992 9d40349a 2019-05-09 stsp goto done;
5994 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5995 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5996 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5997 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5998 09f5bd90 2019-05-09 stsp goto done;
6000 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
6001 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6003 09f5bd90 2019-05-09 stsp goto done;
6004 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6006 ebf99748 2019-05-09 stsp goto done;
6007 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6008 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6009 09f5bd90 2019-05-09 stsp goto done;
6011 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
6012 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
6014 f2c16586 2019-05-09 stsp goto done;
6015 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
6017 f2c16586 2019-05-09 stsp goto done;
6019 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6021 09f5bd90 2019-05-09 stsp goto done;
6023 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
6025 ebf99748 2019-05-09 stsp goto done;
6027 10604dce 2021-09-24 thomas got_object_id_queue_free(&parent_ids);
6028 588edf97 2019-05-10 stsp if (head_tree)
6029 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
6030 588edf97 2019-05-10 stsp if (head_commit)
6031 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
6032 09f5bd90 2019-05-09 stsp free(head_commit_id2);
6033 2f17228e 2019-05-12 stsp if (head_ref2) {
6034 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
6035 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
6036 2f17228e 2019-05-12 stsp err = unlockerr;
6037 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
6039 39cd0ff6 2019-07-12 stsp return err;
6042 5c1e53bc 2019-07-28 stsp static const struct got_error *
6043 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
6044 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
6046 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
6047 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
6049 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
6050 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
6051 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
6053 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
6054 5c1e53bc 2019-07-28 stsp ct_path++;
6056 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
6057 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
6061 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
6062 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
6064 5c1e53bc 2019-07-28 stsp return NULL;
6067 f0b75401 2019-08-03 stsp static const struct got_error *
6068 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
6070 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
6072 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6073 f0b75401 2019-08-03 stsp *have_staged_files = 1;
6074 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
6077 f0b75401 2019-08-03 stsp return NULL;
6080 5f8a88c6 2019-08-03 stsp static const struct got_error *
6081 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
6082 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
6084 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
6085 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
6087 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6088 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
6090 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6091 5f8a88c6 2019-08-03 stsp if (ie == NULL)
6092 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6093 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6094 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
6095 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
6098 5f8a88c6 2019-08-03 stsp return NULL;
6101 39cd0ff6 2019-07-12 stsp const struct got_error *
6102 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
6103 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
6104 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
6105 ef899790 2022-11-01 thomas int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6106 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
6107 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
6109 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6110 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
6111 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
6112 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6113 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6114 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
6115 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
6116 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6117 ef899790 2022-11-01 thomas char *diff_path = NULL;
6118 f0b75401 2019-08-03 stsp int have_staged_files = 0;
6120 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
6122 ef899790 2022-11-01 thomas memset(&cc_arg, 0, sizeof(cc_arg));
6123 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6125 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
6127 39cd0ff6 2019-07-12 stsp goto done;
6129 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6131 39cd0ff6 2019-07-12 stsp goto done;
6133 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6135 39cd0ff6 2019-07-12 stsp goto done;
6137 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6139 39cd0ff6 2019-07-12 stsp goto done;
6141 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6142 5f8a88c6 2019-08-03 stsp &have_staged_files);
6143 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
6144 5f8a88c6 2019-08-03 stsp goto done;
6145 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
6146 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
6148 5f8a88c6 2019-08-03 stsp goto done;
6151 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6152 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
6153 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
6154 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
6155 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
6156 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6157 ef899790 2022-11-01 thomas cc_arg.diff_header_shown = 0;
6158 ef899790 2022-11-01 thomas if (show_diff) {
6159 ef899790 2022-11-01 thomas err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6160 fc2a50f2 2022-11-01 thomas GOT_TMPDIR_STR "/got", ".diff");
6161 ef899790 2022-11-01 thomas if (err)
6162 ef899790 2022-11-01 thomas goto done;
6163 ef899790 2022-11-01 thomas cc_arg.f1 = got_opentemp();
6164 ef899790 2022-11-01 thomas if (cc_arg.f1 == NULL) {
6165 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentemp");
6166 ef899790 2022-11-01 thomas goto done;
6168 ef899790 2022-11-01 thomas cc_arg.f2 = got_opentemp();
6169 ef899790 2022-11-01 thomas if (cc_arg.f2 == NULL) {
6170 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentemp");
6171 ef899790 2022-11-01 thomas goto done;
6175 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6176 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6177 43896ae6 2022-09-02 thomas collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6179 5c1e53bc 2019-07-28 stsp goto done;
6182 ef899790 2022-11-01 thomas if (show_diff) {
6183 ef899790 2022-11-01 thomas if (fflush(cc_arg.diff_outfile) == EOF) {
6184 ef899790 2022-11-01 thomas err = got_error_from_errno("fflush");
6185 ef899790 2022-11-01 thomas goto done;
6189 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6190 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6191 39cd0ff6 2019-07-12 stsp goto done;
6194 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6195 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
6197 5c1e53bc 2019-07-28 stsp goto done;
6200 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6201 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
6202 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
6204 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
6205 f0b75401 2019-08-03 stsp ct_path++;
6206 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
6207 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6208 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6210 b50cabdf 2019-07-12 stsp goto done;
6214 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
6215 9e1ed038 2022-11-01 thomas head_commit_id, NULL, worktree, author, committer,
6216 9e1ed038 2022-11-01 thomas (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6217 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6219 39cd0ff6 2019-07-12 stsp goto done;
6221 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6222 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
6223 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6224 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
6225 39cd0ff6 2019-07-12 stsp err = sync_err;
6227 39cd0ff6 2019-07-12 stsp if (fileindex)
6228 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
6229 39cd0ff6 2019-07-12 stsp free(fileindex_path);
6230 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6231 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
6232 39cd0ff6 2019-07-12 stsp err = unlockerr;
6233 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6234 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
6236 39cd0ff6 2019-07-12 stsp free_commitable(ct);
6238 21c2d8be 2023-01-10 thomas got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6239 ef899790 2022-11-01 thomas if (diff_path && unlink(diff_path) == -1 && err == NULL)
6240 ef899790 2022-11-01 thomas err = got_error_from_errno2("unlink", diff_path);
6241 ef899790 2022-11-01 thomas free(diff_path);
6242 ef899790 2022-11-01 thomas if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6243 ef899790 2022-11-01 thomas err == NULL)
6244 ef899790 2022-11-01 thomas err = got_error_from_errno("fclose");
6245 c4296144 2019-05-09 stsp return err;
6248 8656d6c4 2019-05-20 stsp const char *
6249 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
6251 8656d6c4 2019-05-20 stsp return ct->path;
6254 8656d6c4 2019-05-20 stsp unsigned int
6255 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
6257 8656d6c4 2019-05-20 stsp return ct->status;
6260 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
6261 818c7501 2019-07-11 stsp struct got_worktree *worktree;
6262 818c7501 2019-07-11 stsp struct got_repository *repo;
6265 818c7501 2019-07-11 stsp static const struct got_error *
6266 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6268 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6269 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
6270 818c7501 2019-07-11 stsp unsigned char status;
6271 818c7501 2019-07-11 stsp struct stat sb;
6272 818c7501 2019-07-11 stsp char *ondisk_path;
6274 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
6275 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6276 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
6277 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
6279 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6281 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
6283 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
6284 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6285 818c7501 2019-07-11 stsp free(ondisk_path);
6287 818c7501 2019-07-11 stsp return err;
6289 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
6290 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
6291 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6292 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6294 818c7501 2019-07-11 stsp return NULL;
6297 818c7501 2019-07-11 stsp const struct got_error *
6298 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6299 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6300 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
6301 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6303 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6304 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6305 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6306 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6307 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6308 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6309 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6311 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6312 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6313 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6315 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6317 818c7501 2019-07-11 stsp return err;
6319 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6321 818c7501 2019-07-11 stsp goto done;
6323 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6324 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6325 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6328 818c7501 2019-07-11 stsp goto done;
6330 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6332 818c7501 2019-07-11 stsp goto done;
6334 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6336 818c7501 2019-07-11 stsp goto done;
6338 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6340 818c7501 2019-07-11 stsp goto done;
6342 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6345 e51d7b55 2020-01-04 stsp goto done;
6347 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6349 818c7501 2019-07-11 stsp goto done;
6350 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6351 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6352 e51d7b55 2020-01-04 stsp goto done;
6355 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6356 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6358 818c7501 2019-07-11 stsp goto done;
6359 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6361 818c7501 2019-07-11 stsp goto done;
6363 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6365 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6367 818c7501 2019-07-11 stsp goto done;
6369 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6371 818c7501 2019-07-11 stsp goto done;
6373 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6374 818c7501 2019-07-11 stsp worktree->base_commit_id);
6376 818c7501 2019-07-11 stsp goto done;
6377 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6379 818c7501 2019-07-11 stsp goto done;
6381 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6383 818c7501 2019-07-11 stsp goto done;
6385 818c7501 2019-07-11 stsp free(fileindex_path);
6386 818c7501 2019-07-11 stsp free(tmp_branch_name);
6387 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6388 818c7501 2019-07-11 stsp free(branch_ref_name);
6389 818c7501 2019-07-11 stsp if (branch_ref)
6390 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6391 818c7501 2019-07-11 stsp if (wt_branch)
6392 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6393 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6394 818c7501 2019-07-11 stsp if (err) {
6395 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6396 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6397 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6399 818c7501 2019-07-11 stsp if (*tmp_branch) {
6400 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6401 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6403 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6404 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6405 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6407 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6409 818c7501 2019-07-11 stsp return err;
6412 818c7501 2019-07-11 stsp const struct got_error *
6413 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6414 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6415 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6416 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6418 818c7501 2019-07-11 stsp const struct got_error *err;
6419 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6420 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6421 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6422 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6423 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6425 818c7501 2019-07-11 stsp *commit_id = NULL;
6426 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6427 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6428 3e3a69f1 2019-07-25 stsp *branch = NULL;
6429 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6431 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6433 3e3a69f1 2019-07-25 stsp return err;
6435 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6437 f032f1f7 2019-08-04 stsp goto done;
6439 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6440 f032f1f7 2019-08-04 stsp &have_staged_files);
6441 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6442 f032f1f7 2019-08-04 stsp goto done;
6443 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6444 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6445 3e3a69f1 2019-07-25 stsp goto done;
6448 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6450 f032f1f7 2019-08-04 stsp goto done;
6452 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6454 818c7501 2019-07-11 stsp goto done;
6456 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6458 818c7501 2019-07-11 stsp goto done;
6460 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6462 818c7501 2019-07-11 stsp goto done;
6464 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6466 818c7501 2019-07-11 stsp goto done;
6468 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6469 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6471 818c7501 2019-07-11 stsp goto done;
6473 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6475 818c7501 2019-07-11 stsp goto done;
6477 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6479 818c7501 2019-07-11 stsp goto done;
6481 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6482 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6484 818c7501 2019-07-11 stsp goto done;
6486 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6488 818c7501 2019-07-11 stsp goto done;
6490 818c7501 2019-07-11 stsp free(commit_ref_name);
6491 818c7501 2019-07-11 stsp free(branch_ref_name);
6492 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6493 818c7501 2019-07-11 stsp if (commit_ref)
6494 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6495 818c7501 2019-07-11 stsp if (branch_ref)
6496 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6497 818c7501 2019-07-11 stsp if (err) {
6498 818c7501 2019-07-11 stsp free(*commit_id);
6499 818c7501 2019-07-11 stsp *commit_id = NULL;
6500 818c7501 2019-07-11 stsp if (*tmp_branch) {
6501 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6502 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6504 818c7501 2019-07-11 stsp if (*new_base_branch) {
6505 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6506 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6508 818c7501 2019-07-11 stsp if (*branch) {
6509 818c7501 2019-07-11 stsp got_ref_close(*branch);
6510 818c7501 2019-07-11 stsp *branch = NULL;
6512 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6513 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6514 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6516 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6518 818c7501 2019-07-11 stsp return err;
6521 818c7501 2019-07-11 stsp const struct got_error *
6522 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6524 818c7501 2019-07-11 stsp const struct got_error *err;
6525 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6527 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6529 818c7501 2019-07-11 stsp return err;
6531 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6532 818c7501 2019-07-11 stsp free(tmp_branch_name);
6533 818c7501 2019-07-11 stsp return NULL;
6536 818c7501 2019-07-11 stsp static const struct got_error *
6537 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6538 ef899790 2022-11-01 thomas const char *diff_path, char **logmsg, void *arg)
6540 0ebf8283 2019-07-24 stsp *logmsg = arg;
6541 818c7501 2019-07-11 stsp return NULL;
6544 818c7501 2019-07-11 stsp static const struct got_error *
6545 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6546 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6547 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6548 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6550 818c7501 2019-07-11 stsp return NULL;
6553 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6554 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6555 01757395 2019-07-12 stsp void *progress_arg;
6556 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6559 01757395 2019-07-12 stsp static const struct got_error *
6560 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6562 01757395 2019-07-12 stsp const struct got_error *err;
6563 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6565 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6567 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6569 01757395 2019-07-12 stsp return err;
6571 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6572 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6573 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6574 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6575 01757395 2019-07-12 stsp return NULL;
6577 01757395 2019-07-12 stsp p = strdup(path);
6578 01757395 2019-07-12 stsp if (p == NULL)
6579 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6581 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6582 01757395 2019-07-12 stsp if (err || new == NULL)
6584 01757395 2019-07-12 stsp return err;
6587 0ebf8283 2019-07-24 stsp static const struct got_error *
6588 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6589 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6591 818c7501 2019-07-11 stsp const struct got_error *err;
6592 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6594 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6595 818c7501 2019-07-11 stsp if (err) {
6596 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6597 818c7501 2019-07-11 stsp goto done;
6598 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6600 818c7501 2019-07-11 stsp goto done;
6601 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6603 818c7501 2019-07-11 stsp goto done;
6604 de05890f 2020-03-05 stsp } else if (is_rebase) {
6605 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6608 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6610 818c7501 2019-07-11 stsp goto done;
6611 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6612 818c7501 2019-07-11 stsp free(stored_id);
6613 818c7501 2019-07-11 stsp if (cmp != 0) {
6614 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6615 818c7501 2019-07-11 stsp goto done;
6619 0ebf8283 2019-07-24 stsp if (commit_ref)
6620 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6621 0ebf8283 2019-07-24 stsp return err;
6624 0ebf8283 2019-07-24 stsp static const struct got_error *
6625 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6626 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6627 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6628 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6629 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6630 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6632 0ebf8283 2019-07-24 stsp const struct got_error *err;
6633 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6634 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6635 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6637 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6639 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6641 0ebf8283 2019-07-24 stsp return err;
6643 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6644 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6645 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6646 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6647 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6648 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6649 818c7501 2019-07-11 stsp if (commit_ref)
6650 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6651 818c7501 2019-07-11 stsp return err;
6654 818c7501 2019-07-11 stsp const struct got_error *
6655 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6656 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6657 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6658 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6659 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6660 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6662 0ebf8283 2019-07-24 stsp const struct got_error *err;
6663 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6665 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6667 0ebf8283 2019-07-24 stsp return err;
6669 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6671 0ebf8283 2019-07-24 stsp goto done;
6673 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6674 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6675 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6677 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6678 0ebf8283 2019-07-24 stsp return err;
6681 0ebf8283 2019-07-24 stsp const struct got_error *
6682 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6683 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6684 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6685 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6686 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6687 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6689 0ebf8283 2019-07-24 stsp const struct got_error *err;
6690 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6692 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6694 0ebf8283 2019-07-24 stsp return err;
6696 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6698 0ebf8283 2019-07-24 stsp goto done;
6700 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6701 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6702 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6704 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6705 0ebf8283 2019-07-24 stsp return err;
6708 0ebf8283 2019-07-24 stsp static const struct got_error *
6709 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6710 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6711 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6712 150d7275 2022-07-22 thomas struct got_reference *tmp_branch, const char *committer,
6713 150d7275 2022-07-22 thomas struct got_commit_object *orig_commit, const char *new_logmsg,
6714 150d7275 2022-07-22 thomas struct got_repository *repo)
6716 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6717 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6718 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6719 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6720 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6721 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6722 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6724 ef899790 2022-11-01 thomas memset(&cc_arg, 0, sizeof(cc_arg));
6725 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6726 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6728 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6730 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6732 3e3a69f1 2019-07-25 stsp return err;
6734 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6735 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6736 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6737 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6739 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6740 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6742 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6743 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6744 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6745 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6746 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6747 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6749 01757395 2019-07-12 stsp if (merged_paths) {
6750 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6751 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6752 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6753 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6756 01757395 2019-07-12 stsp goto done;
6759 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6760 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6762 01757395 2019-07-12 stsp goto done;
6765 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6766 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6767 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6769 a0e95631 2019-07-12 stsp goto done;
6770 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6771 a0e95631 2019-07-12 stsp goto done;
6774 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6776 edd02c5e 2019-07-11 stsp goto done;
6778 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6780 818c7501 2019-07-11 stsp goto done;
6782 5943eee2 2019-08-13 stsp if (new_logmsg) {
6783 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6784 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6785 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6786 5943eee2 2019-08-13 stsp goto done;
6789 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6791 5943eee2 2019-08-13 stsp goto done;
6794 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6795 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6796 10604dce 2021-09-24 thomas NULL, worktree, got_object_commit_get_author(orig_commit),
6797 8db00f97 2022-07-22 thomas committer ? committer :
6798 ef899790 2022-11-01 thomas got_object_commit_get_committer(orig_commit), NULL,
6799 8db00f97 2022-07-22 thomas collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6801 a0e95631 2019-07-12 stsp goto done;
6803 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6805 a0e95631 2019-07-12 stsp goto done;
6807 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6809 a0e95631 2019-07-12 stsp goto done;
6811 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6812 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6813 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6814 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6815 a0e95631 2019-07-12 stsp err = sync_err;
6817 a0e95631 2019-07-12 stsp free(fileindex_path);
6818 a0e95631 2019-07-12 stsp free(head_commit_id);
6819 a0e95631 2019-07-12 stsp if (head_ref)
6820 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6821 818c7501 2019-07-11 stsp if (err) {
6822 818c7501 2019-07-11 stsp free(*new_commit_id);
6823 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6825 818c7501 2019-07-11 stsp return err;
6828 818c7501 2019-07-11 stsp const struct got_error *
6829 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6830 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6831 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6832 150d7275 2022-07-22 thomas const char *committer, struct got_commit_object *orig_commit,
6833 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6835 0ebf8283 2019-07-24 stsp const struct got_error *err;
6836 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6837 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6838 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6840 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6842 0ebf8283 2019-07-24 stsp return err;
6844 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6846 0ebf8283 2019-07-24 stsp goto done;
6847 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6849 0ebf8283 2019-07-24 stsp goto done;
6850 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6851 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6852 0ebf8283 2019-07-24 stsp goto done;
6855 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6856 150d7275 2022-07-22 thomas worktree, fileindex, tmp_branch, committer, orig_commit,
6857 150d7275 2022-07-22 thomas NULL, repo);
6859 0ebf8283 2019-07-24 stsp if (commit_ref)
6860 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6861 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6862 0ebf8283 2019-07-24 stsp free(commit_id);
6863 0ebf8283 2019-07-24 stsp return err;
6866 0ebf8283 2019-07-24 stsp const struct got_error *
6867 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6868 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6869 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6870 150d7275 2022-07-22 thomas const char *committer, struct got_commit_object *orig_commit,
6871 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6872 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6874 0ebf8283 2019-07-24 stsp const struct got_error *err;
6875 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6876 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6878 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6880 0ebf8283 2019-07-24 stsp return err;
6882 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6884 0ebf8283 2019-07-24 stsp goto done;
6886 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6887 150d7275 2022-07-22 thomas worktree, fileindex, tmp_branch, committer, orig_commit,
6888 150d7275 2022-07-22 thomas new_logmsg, repo);
6890 0ebf8283 2019-07-24 stsp if (commit_ref)
6891 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6892 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6893 0ebf8283 2019-07-24 stsp return err;
6896 0ebf8283 2019-07-24 stsp const struct got_error *
6897 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6898 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6900 3e3a69f1 2019-07-25 stsp if (fileindex)
6901 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6902 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6905 69844fba 2019-07-11 stsp static const struct got_error *
6906 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6908 69844fba 2019-07-11 stsp const struct got_error *err;
6909 69844fba 2019-07-11 stsp struct got_reference *ref;
6911 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6912 69844fba 2019-07-11 stsp if (err) {
6913 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6914 69844fba 2019-07-11 stsp return NULL;
6915 69844fba 2019-07-11 stsp return err;
6918 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6919 69844fba 2019-07-11 stsp got_ref_close(ref);
6920 69844fba 2019-07-11 stsp return err;
6923 69844fba 2019-07-11 stsp static const struct got_error *
6924 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6926 69844fba 2019-07-11 stsp const struct got_error *err;
6927 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6928 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6930 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6932 69844fba 2019-07-11 stsp goto done;
6933 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6935 69844fba 2019-07-11 stsp goto done;
6937 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6939 69844fba 2019-07-11 stsp goto done;
6940 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6942 69844fba 2019-07-11 stsp goto done;
6944 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6946 69844fba 2019-07-11 stsp goto done;
6947 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6949 69844fba 2019-07-11 stsp goto done;
6951 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6953 69844fba 2019-07-11 stsp goto done;
6954 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6956 69844fba 2019-07-11 stsp goto done;
6959 69844fba 2019-07-11 stsp free(tmp_branch_name);
6960 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6961 69844fba 2019-07-11 stsp free(branch_ref_name);
6962 69844fba 2019-07-11 stsp free(commit_ref_name);
6963 e600f124 2021-03-21 stsp return err;
6966 ef20f542 2022-06-26 thomas static const struct got_error *
6967 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6968 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6970 e600f124 2021-03-21 stsp const struct got_error *err;
6971 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6972 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6973 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6974 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6975 e600f124 2021-03-21 stsp char *refname = NULL;
6977 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6978 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6979 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6980 e600f124 2021-03-21 stsp branch_name += 11;
6982 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6984 e600f124 2021-03-21 stsp return err;
6986 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6987 e600f124 2021-03-21 stsp new_id_str) == -1) {
6988 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6989 e600f124 2021-03-21 stsp goto done;
6992 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6994 e600f124 2021-03-21 stsp goto done;
6996 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6998 e600f124 2021-03-21 stsp goto done;
7000 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
7002 e600f124 2021-03-21 stsp free(new_id_str);
7003 e600f124 2021-03-21 stsp free(refname);
7004 e600f124 2021-03-21 stsp free(old_commit_id);
7006 e600f124 2021-03-21 stsp got_ref_close(ref);
7007 69844fba 2019-07-11 stsp return err;
7010 818c7501 2019-07-11 stsp const struct got_error *
7011 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
7012 f08f28be 2023-02-03 thomas struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7013 f08f28be 2023-02-03 thomas struct got_reference *rebased_branch, struct got_repository *repo,
7014 f08f28be 2023-02-03 thomas int create_backup)
7016 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7017 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
7018 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7020 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7022 818c7501 2019-07-11 stsp return err;
7024 e600f124 2021-03-21 stsp if (create_backup) {
7025 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7026 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
7028 e600f124 2021-03-21 stsp goto done;
7031 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7033 818c7501 2019-07-11 stsp goto done;
7035 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
7037 818c7501 2019-07-11 stsp goto done;
7039 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
7041 818c7501 2019-07-11 stsp goto done;
7043 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
7045 a615e0e7 2020-12-16 stsp goto done;
7047 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7049 a615e0e7 2020-12-16 stsp goto done;
7050 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7051 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7052 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7053 a615e0e7 2020-12-16 stsp err = sync_err;
7055 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7056 a615e0e7 2020-12-16 stsp free(fileindex_path);
7057 818c7501 2019-07-11 stsp free(new_head_commit_id);
7058 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7059 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7060 818c7501 2019-07-11 stsp err = unlockerr;
7061 818c7501 2019-07-11 stsp return err;
7064 818c7501 2019-07-11 stsp const struct got_error *
7065 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
7066 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7067 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
7068 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
7070 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
7071 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
7072 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
7073 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7074 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
7075 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7076 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
7078 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
7080 818c7501 2019-07-11 stsp return err;
7082 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
7083 945f9229 2022-04-16 thomas worktree->base_commit_id);
7084 945f9229 2022-04-16 thomas if (err)
7085 945f9229 2022-04-16 thomas goto done;
7087 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
7088 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
7090 818c7501 2019-07-11 stsp goto done;
7092 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
7094 818c7501 2019-07-11 stsp goto done;
7097 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
7098 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
7099 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
7101 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
7103 818c7501 2019-07-11 stsp goto done;
7105 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7107 818c7501 2019-07-11 stsp goto done;
7109 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7110 945f9229 2022-04-16 thomas worktree->path_prefix);
7112 ca355955 2019-07-12 stsp goto done;
7114 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
7116 ca355955 2019-07-12 stsp goto done;
7118 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7120 818c7501 2019-07-11 stsp goto done;
7122 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7123 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7124 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7125 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7126 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7127 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7128 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7129 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
7130 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
7131 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7133 1f1abb7e 2019-08-08 stsp goto sync;
7135 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7136 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
7138 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7139 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
7140 ca355955 2019-07-12 stsp err = sync_err;
7142 818c7501 2019-07-11 stsp got_ref_close(resolved);
7143 a3a2faf2 2019-07-12 stsp free(tree_id);
7144 818c7501 2019-07-11 stsp free(commit_id);
7145 945f9229 2022-04-16 thomas if (commit)
7146 945f9229 2022-04-16 thomas got_object_commit_close(commit);
7147 0ebf8283 2019-07-24 stsp if (fileindex)
7148 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
7149 0ebf8283 2019-07-24 stsp free(fileindex_path);
7151 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7152 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7153 0ebf8283 2019-07-24 stsp err = unlockerr;
7154 0ebf8283 2019-07-24 stsp return err;
7157 0ebf8283 2019-07-24 stsp const struct got_error *
7158 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7159 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7160 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7161 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7163 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7164 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7165 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
7166 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
7167 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7168 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
7169 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
7170 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7172 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7173 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7174 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7175 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7177 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7179 0ebf8283 2019-07-24 stsp return err;
7181 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7183 0ebf8283 2019-07-24 stsp goto done;
7185 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
7186 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
7187 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7190 0ebf8283 2019-07-24 stsp goto done;
7192 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7194 0ebf8283 2019-07-24 stsp goto done;
7196 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7198 0ebf8283 2019-07-24 stsp goto done;
7200 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7201 0ebf8283 2019-07-24 stsp worktree);
7203 0ebf8283 2019-07-24 stsp goto done;
7205 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7208 0ebf8283 2019-07-24 stsp goto done;
7210 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7212 0ebf8283 2019-07-24 stsp goto done;
7214 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
7216 0ebf8283 2019-07-24 stsp goto done;
7218 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7219 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7221 0ebf8283 2019-07-24 stsp goto done;
7222 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
7224 0ebf8283 2019-07-24 stsp goto done;
7225 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7226 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
7227 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
7228 0ebf8283 2019-07-24 stsp goto done;
7231 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
7232 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7234 0ebf8283 2019-07-24 stsp goto done;
7235 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
7237 0ebf8283 2019-07-24 stsp goto done;
7239 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
7241 0ebf8283 2019-07-24 stsp goto done;
7243 0ebf8283 2019-07-24 stsp free(fileindex_path);
7244 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7245 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7246 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7247 0ebf8283 2019-07-24 stsp if (wt_branch)
7248 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
7249 0ebf8283 2019-07-24 stsp if (err) {
7250 0ebf8283 2019-07-24 stsp if (*branch_ref) {
7251 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
7252 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7254 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7255 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7256 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7258 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7259 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7260 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7261 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7263 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
7265 0ebf8283 2019-07-24 stsp return err;
7268 0ebf8283 2019-07-24 stsp const struct got_error *
7269 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
7270 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
7272 3e3a69f1 2019-07-25 stsp if (fileindex)
7273 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
7274 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
7277 0ebf8283 2019-07-24 stsp const struct got_error *
7278 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
7279 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
7281 0ebf8283 2019-07-24 stsp const struct got_error *err;
7282 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7284 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7286 0ebf8283 2019-07-24 stsp return err;
7288 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7289 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7290 0ebf8283 2019-07-24 stsp return NULL;
7293 0ebf8283 2019-07-24 stsp const struct got_error *
7294 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
7295 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
7296 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7297 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7299 0ebf8283 2019-07-24 stsp const struct got_error *err;
7300 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7301 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7302 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
7303 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7304 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
7305 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
7307 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7308 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7309 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7310 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7312 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7314 3e3a69f1 2019-07-25 stsp return err;
7316 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7318 f032f1f7 2019-08-04 stsp goto done;
7320 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7321 f032f1f7 2019-08-04 stsp &have_staged_files);
7322 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7323 f032f1f7 2019-08-04 stsp goto done;
7324 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7325 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7326 3e3a69f1 2019-07-25 stsp goto done;
7329 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7331 f032f1f7 2019-08-04 stsp goto done;
7333 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7335 0ebf8283 2019-07-24 stsp goto done;
7337 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7339 0ebf8283 2019-07-24 stsp goto done;
7341 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7342 0ebf8283 2019-07-24 stsp worktree);
7344 0ebf8283 2019-07-24 stsp goto done;
7346 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7348 0ebf8283 2019-07-24 stsp goto done;
7350 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7352 0ebf8283 2019-07-24 stsp goto done;
7353 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7355 0ebf8283 2019-07-24 stsp goto done;
7357 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7359 0ebf8283 2019-07-24 stsp goto done;
7360 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7362 0ebf8283 2019-07-24 stsp goto done;
7364 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7366 0ebf8283 2019-07-24 stsp goto done;
7368 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7369 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7370 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7371 0ebf8283 2019-07-24 stsp if (commit_ref)
7372 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7373 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7374 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7375 0ebf8283 2019-07-24 stsp if (err) {
7376 0ebf8283 2019-07-24 stsp free(*commit_id);
7377 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7378 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7379 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7380 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7381 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7382 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7384 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7385 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7386 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7388 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7390 0ebf8283 2019-07-24 stsp return err;
7393 0ebf8283 2019-07-24 stsp static const struct got_error *
7394 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7396 0ebf8283 2019-07-24 stsp const struct got_error *err;
7397 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7398 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7400 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7402 0ebf8283 2019-07-24 stsp goto done;
7403 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7405 0ebf8283 2019-07-24 stsp goto done;
7407 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7408 0ebf8283 2019-07-24 stsp worktree);
7410 0ebf8283 2019-07-24 stsp goto done;
7411 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7413 0ebf8283 2019-07-24 stsp goto done;
7415 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7417 0ebf8283 2019-07-24 stsp goto done;
7418 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7420 0ebf8283 2019-07-24 stsp goto done;
7422 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7424 0ebf8283 2019-07-24 stsp goto done;
7425 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7427 0ebf8283 2019-07-24 stsp goto done;
7429 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7430 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7431 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7432 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7433 0ebf8283 2019-07-24 stsp return err;
7436 0ebf8283 2019-07-24 stsp const struct got_error *
7437 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7438 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7439 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7440 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7442 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7443 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7444 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7445 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7446 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7447 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7449 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7451 0ebf8283 2019-07-24 stsp return err;
7453 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
7454 945f9229 2022-04-16 thomas worktree->base_commit_id);
7455 945f9229 2022-04-16 thomas if (err)
7456 945f9229 2022-04-16 thomas goto done;
7458 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7459 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7461 0ebf8283 2019-07-24 stsp goto done;
7463 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7465 0ebf8283 2019-07-24 stsp goto done;
7467 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7469 0ebf8283 2019-07-24 stsp goto done;
7471 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7472 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7474 0ebf8283 2019-07-24 stsp goto done;
7476 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7478 0ebf8283 2019-07-24 stsp goto done;
7480 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7482 0ebf8283 2019-07-24 stsp goto done;
7484 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7485 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7486 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7487 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7488 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7489 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7490 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7491 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
7492 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7493 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7495 1f1abb7e 2019-08-08 stsp goto sync;
7497 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7498 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7500 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7501 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7502 0ebf8283 2019-07-24 stsp err = sync_err;
7504 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7505 0ebf8283 2019-07-24 stsp free(tree_id);
7506 818c7501 2019-07-11 stsp free(fileindex_path);
7508 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7509 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7510 818c7501 2019-07-11 stsp err = unlockerr;
7511 818c7501 2019-07-11 stsp return err;
7514 0ebf8283 2019-07-24 stsp const struct got_error *
7515 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7516 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7517 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7519 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7520 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7521 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7522 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7524 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7526 0ebf8283 2019-07-24 stsp return err;
7528 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7529 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7531 e600f124 2021-03-21 stsp goto done;
7533 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7534 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7536 0ebf8283 2019-07-24 stsp goto done;
7538 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7540 0ebf8283 2019-07-24 stsp goto done;
7542 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7544 0ebf8283 2019-07-24 stsp goto done;
7546 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7548 0ebf8283 2019-07-24 stsp goto done;
7550 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7552 a615e0e7 2020-12-16 stsp goto done;
7554 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7556 a615e0e7 2020-12-16 stsp goto done;
7557 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7558 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7559 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7560 a615e0e7 2020-12-16 stsp err = sync_err;
7562 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7563 a615e0e7 2020-12-16 stsp free(fileindex_path);
7564 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7565 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7566 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7567 0ebf8283 2019-07-24 stsp err = unlockerr;
7568 0ebf8283 2019-07-24 stsp return err;
7571 0ebf8283 2019-07-24 stsp const struct got_error *
7572 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7573 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7575 0ebf8283 2019-07-24 stsp const struct got_error *err;
7576 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7578 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7580 0ebf8283 2019-07-24 stsp return err;
7582 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7584 0ebf8283 2019-07-24 stsp goto done;
7586 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7588 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7589 2822a352 2019-10-15 stsp return err;
7592 2822a352 2019-10-15 stsp const struct got_error *
7593 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7594 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7595 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7596 2822a352 2019-10-15 stsp struct got_repository *repo)
7598 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7599 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7600 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7602 2822a352 2019-10-15 stsp *fileindex = NULL;
7603 2822a352 2019-10-15 stsp *branch_ref = NULL;
7604 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7606 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7608 2822a352 2019-10-15 stsp return err;
7610 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7611 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7612 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7613 2822a352 2019-10-15 stsp "update -b or different branch name required");
7614 2822a352 2019-10-15 stsp goto done;
7617 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7619 2822a352 2019-10-15 stsp goto done;
7621 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7622 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7623 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7624 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7627 2822a352 2019-10-15 stsp goto done;
7629 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7631 2822a352 2019-10-15 stsp goto done;
7633 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7634 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7636 2822a352 2019-10-15 stsp if (err) {
7637 2822a352 2019-10-15 stsp if (*branch_ref) {
7638 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7639 2822a352 2019-10-15 stsp *branch_ref = NULL;
7641 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7642 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7643 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7645 2822a352 2019-10-15 stsp if (*fileindex) {
7646 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7647 2822a352 2019-10-15 stsp *fileindex = NULL;
7649 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7651 0cb83759 2019-08-03 stsp return err;
7654 2822a352 2019-10-15 stsp const struct got_error *
7655 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7656 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7657 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7658 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7659 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7661 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7662 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7663 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7664 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7666 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7668 2822a352 2019-10-15 stsp goto done;
7670 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7672 2822a352 2019-10-15 stsp goto done;
7674 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, commit_id);
7675 945f9229 2022-04-16 thomas if (err)
7676 945f9229 2022-04-16 thomas goto done;
7678 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7679 2822a352 2019-10-15 stsp worktree->path_prefix);
7681 2822a352 2019-10-15 stsp goto done;
7683 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7685 2822a352 2019-10-15 stsp goto done;
7687 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7688 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7690 2822a352 2019-10-15 stsp goto sync;
7692 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7694 2822a352 2019-10-15 stsp goto sync;
7696 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7698 6e210706 2021-01-22 stsp goto sync;
7700 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7702 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7703 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7704 2822a352 2019-10-15 stsp err = sync_err;
7707 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7708 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7709 2822a352 2019-10-15 stsp err = unlockerr;
7710 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7712 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7713 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7714 2822a352 2019-10-15 stsp err = unlockerr;
7715 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7717 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7718 2822a352 2019-10-15 stsp free(fileindex_path);
7719 2822a352 2019-10-15 stsp free(tree_id);
7720 945f9229 2022-04-16 thomas if (commit)
7721 945f9229 2022-04-16 thomas got_object_commit_close(commit);
7723 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7724 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7725 2822a352 2019-10-15 stsp err = unlockerr;
7726 2822a352 2019-10-15 stsp return err;
7729 2822a352 2019-10-15 stsp const struct got_error *
7730 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7731 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7732 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7734 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7736 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7738 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7740 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7741 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7742 8b692cd0 2019-10-21 stsp err = unlockerr;
7743 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7745 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7746 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7747 8b692cd0 2019-10-21 stsp err = unlockerr;
7748 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7750 10604dce 2021-09-24 thomas return err;
7753 10604dce 2021-09-24 thomas const struct got_error *
7754 10604dce 2021-09-24 thomas got_worktree_merge_postpone(struct got_worktree *worktree,
7755 10604dce 2021-09-24 thomas struct got_fileindex *fileindex)
7757 10604dce 2021-09-24 thomas const struct got_error *err, *sync_err;
7758 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7760 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7761 10604dce 2021-09-24 thomas if (err)
7762 10604dce 2021-09-24 thomas goto done;
7764 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7766 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_SH);
7767 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7768 10604dce 2021-09-24 thomas err = sync_err;
7770 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7771 10604dce 2021-09-24 thomas free(fileindex_path);
7772 8b692cd0 2019-10-21 stsp return err;
7775 10604dce 2021-09-24 thomas static const struct got_error *
7776 10604dce 2021-09-24 thomas delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7778 10604dce 2021-09-24 thomas const struct got_error *err;
7779 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7781 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7782 10604dce 2021-09-24 thomas if (err)
7783 10604dce 2021-09-24 thomas goto done;
7784 10604dce 2021-09-24 thomas err = delete_ref(branch_refname, repo);
7785 10604dce 2021-09-24 thomas if (err)
7786 10604dce 2021-09-24 thomas goto done;
7788 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7789 10604dce 2021-09-24 thomas if (err)
7790 10604dce 2021-09-24 thomas goto done;
7791 10604dce 2021-09-24 thomas err = delete_ref(commit_refname, repo);
7792 10604dce 2021-09-24 thomas if (err)
7793 10604dce 2021-09-24 thomas goto done;
7796 10604dce 2021-09-24 thomas free(branch_refname);
7797 10604dce 2021-09-24 thomas free(commit_refname);
7798 10604dce 2021-09-24 thomas return err;
7801 10604dce 2021-09-24 thomas struct merge_commit_msg_arg {
7802 10604dce 2021-09-24 thomas struct got_worktree *worktree;
7803 10604dce 2021-09-24 thomas const char *branch_name;
7806 10604dce 2021-09-24 thomas static const struct got_error *
7807 ef899790 2022-11-01 thomas merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7808 ef899790 2022-11-01 thomas const char *diff_path, char **logmsg, void *arg)
7810 10604dce 2021-09-24 thomas struct merge_commit_msg_arg *a = arg;
7812 10604dce 2021-09-24 thomas if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7813 10604dce 2021-09-24 thomas got_worktree_get_head_ref_name(a->worktree)) == -1)
7814 10604dce 2021-09-24 thomas return got_error_from_errno("asprintf");
7816 10604dce 2021-09-24 thomas return NULL;
7820 10604dce 2021-09-24 thomas const struct got_error *
7821 10604dce 2021-09-24 thomas got_worktree_merge_branch(struct got_worktree *worktree,
7822 10604dce 2021-09-24 thomas struct got_fileindex *fileindex,
7823 10604dce 2021-09-24 thomas struct got_object_id *yca_commit_id,
7824 10604dce 2021-09-24 thomas struct got_object_id *branch_tip,
7825 10604dce 2021-09-24 thomas struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7826 10604dce 2021-09-24 thomas void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7828 10604dce 2021-09-24 thomas const struct got_error *err;
7829 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7831 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7832 10604dce 2021-09-24 thomas if (err)
7833 10604dce 2021-09-24 thomas goto done;
7835 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7836 10604dce 2021-09-24 thomas worktree);
7837 10604dce 2021-09-24 thomas if (err)
7838 10604dce 2021-09-24 thomas goto done;
7840 10604dce 2021-09-24 thomas err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7841 10604dce 2021-09-24 thomas branch_tip, repo, progress_cb, progress_arg,
7842 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
7844 10604dce 2021-09-24 thomas free(fileindex_path);
7845 10604dce 2021-09-24 thomas return err;
7848 10604dce 2021-09-24 thomas const struct got_error *
7849 10604dce 2021-09-24 thomas got_worktree_merge_commit(struct got_object_id **new_commit_id,
7850 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
7851 10604dce 2021-09-24 thomas const char *author, const char *committer, int allow_bad_symlinks,
7852 10604dce 2021-09-24 thomas struct got_object_id *branch_tip, const char *branch_name,
7853 ae1e948a 2021-09-28 thomas struct got_repository *repo,
7854 ae1e948a 2021-09-28 thomas got_worktree_status_cb status_cb, void *status_arg)
7857 10604dce 2021-09-24 thomas const struct got_error *err = NULL, *sync_err;
7858 10604dce 2021-09-24 thomas struct got_pathlist_head commitable_paths;
7859 10604dce 2021-09-24 thomas struct collect_commitables_arg cc_arg;
7860 10604dce 2021-09-24 thomas struct got_pathlist_entry *pe;
7861 10604dce 2021-09-24 thomas struct got_reference *head_ref = NULL;
7862 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id = NULL;
7863 10604dce 2021-09-24 thomas int have_staged_files = 0;
7864 10604dce 2021-09-24 thomas struct merge_commit_msg_arg mcm_arg;
7865 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7867 ef899790 2022-11-01 thomas memset(&cc_arg, 0, sizeof(cc_arg));
7868 10604dce 2021-09-24 thomas *new_commit_id = NULL;
7870 10604dce 2021-09-24 thomas TAILQ_INIT(&commitable_paths);
7872 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7873 10604dce 2021-09-24 thomas if (err)
7874 10604dce 2021-09-24 thomas goto done;
7876 10604dce 2021-09-24 thomas err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7877 10604dce 2021-09-24 thomas if (err)
7878 10604dce 2021-09-24 thomas goto done;
7880 10604dce 2021-09-24 thomas err = got_ref_resolve(&head_commit_id, repo, head_ref);
7881 10604dce 2021-09-24 thomas if (err)
7882 10604dce 2021-09-24 thomas goto done;
7884 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7885 10604dce 2021-09-24 thomas &have_staged_files);
7886 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7887 10604dce 2021-09-24 thomas goto done;
7888 10604dce 2021-09-24 thomas if (have_staged_files) {
7889 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7890 10604dce 2021-09-24 thomas goto done;
7893 10604dce 2021-09-24 thomas cc_arg.commitable_paths = &commitable_paths;
7894 10604dce 2021-09-24 thomas cc_arg.worktree = worktree;
7895 10604dce 2021-09-24 thomas cc_arg.fileindex = fileindex;
7896 10604dce 2021-09-24 thomas cc_arg.repo = repo;
7897 10604dce 2021-09-24 thomas cc_arg.have_staged_files = have_staged_files;
7898 10604dce 2021-09-24 thomas cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7899 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7900 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7901 10604dce 2021-09-24 thomas if (err)
7902 10604dce 2021-09-24 thomas goto done;
7904 10604dce 2021-09-24 thomas if (TAILQ_EMPTY(&commitable_paths)) {
7905 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7906 10604dce 2021-09-24 thomas "merge of %s cannot proceed", branch_name);
7907 10604dce 2021-09-24 thomas goto done;
7910 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7911 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7912 10604dce 2021-09-24 thomas const char *ct_path = ct->in_repo_path;
7914 10604dce 2021-09-24 thomas while (ct_path[0] == '/')
7915 10604dce 2021-09-24 thomas ct_path++;
7916 10604dce 2021-09-24 thomas err = check_out_of_date(ct_path, ct->status,
7917 10604dce 2021-09-24 thomas ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7918 10604dce 2021-09-24 thomas head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7919 10604dce 2021-09-24 thomas if (err)
7920 10604dce 2021-09-24 thomas goto done;
7924 10604dce 2021-09-24 thomas mcm_arg.worktree = worktree;
7925 10604dce 2021-09-24 thomas mcm_arg.branch_name = branch_name;
7926 10604dce 2021-09-24 thomas err = commit_worktree(new_commit_id, &commitable_paths,
7927 ef899790 2022-11-01 thomas head_commit_id, branch_tip, worktree, author, committer, NULL,
7928 ae1e948a 2021-09-28 thomas merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7929 10604dce 2021-09-24 thomas if (err)
7930 10604dce 2021-09-24 thomas goto done;
7932 10604dce 2021-09-24 thomas err = update_fileindex_after_commit(worktree, &commitable_paths,
7933 10604dce 2021-09-24 thomas *new_commit_id, fileindex, have_staged_files);
7934 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7935 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7936 10604dce 2021-09-24 thomas err = sync_err;
7938 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7939 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7941 10604dce 2021-09-24 thomas free_commitable(ct);
7943 21c2d8be 2023-01-10 thomas got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
7944 10604dce 2021-09-24 thomas free(fileindex_path);
7945 10604dce 2021-09-24 thomas return err;
7948 10604dce 2021-09-24 thomas const struct got_error *
7949 10604dce 2021-09-24 thomas got_worktree_merge_complete(struct got_worktree *worktree,
7950 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo)
7952 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7953 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7955 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7956 10604dce 2021-09-24 thomas if (err)
7957 10604dce 2021-09-24 thomas goto done;
7959 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7960 10604dce 2021-09-24 thomas if (err)
7961 10604dce 2021-09-24 thomas goto done;
7962 10604dce 2021-09-24 thomas err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7963 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7964 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7965 10604dce 2021-09-24 thomas err = sync_err;
7967 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7968 10604dce 2021-09-24 thomas free(fileindex_path);
7969 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7970 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7971 10604dce 2021-09-24 thomas err = unlockerr;
7972 10604dce 2021-09-24 thomas return err;
7975 10604dce 2021-09-24 thomas const struct got_error *
7976 10604dce 2021-09-24 thomas got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7977 10604dce 2021-09-24 thomas struct got_repository *repo)
7979 10604dce 2021-09-24 thomas const struct got_error *err;
7980 10604dce 2021-09-24 thomas char *branch_refname = NULL;
7981 10604dce 2021-09-24 thomas struct got_reference *branch_ref = NULL;
7983 10604dce 2021-09-24 thomas *in_progress = 0;
7985 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7986 10604dce 2021-09-24 thomas if (err)
7987 10604dce 2021-09-24 thomas return err;
7988 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7989 dfe86d1f 2021-09-24 thomas free(branch_refname);
7990 10604dce 2021-09-24 thomas if (err) {
7991 10604dce 2021-09-24 thomas if (err->code != GOT_ERR_NOT_REF)
7992 10604dce 2021-09-24 thomas return err;
7994 10604dce 2021-09-24 thomas *in_progress = 1;
7996 10604dce 2021-09-24 thomas return NULL;
7999 10604dce 2021-09-24 thomas const struct got_error *got_worktree_merge_prepare(
8000 10604dce 2021-09-24 thomas struct got_fileindex **fileindex, struct got_worktree *worktree,
8001 10604dce 2021-09-24 thomas struct got_reference *branch, struct got_repository *repo)
8003 10604dce 2021-09-24 thomas const struct got_error *err = NULL;
8004 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
8005 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
8006 10604dce 2021-09-24 thomas struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8007 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL;
8008 10604dce 2021-09-24 thomas struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8009 10604dce 2021-09-24 thomas struct check_rebase_ok_arg ok_arg;
8011 10604dce 2021-09-24 thomas *fileindex = NULL;
8013 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
8014 10604dce 2021-09-24 thomas if (err)
8015 10604dce 2021-09-24 thomas return err;
8017 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
8018 10604dce 2021-09-24 thomas if (err)
8019 10604dce 2021-09-24 thomas goto done;
8021 10604dce 2021-09-24 thomas /* Preconditions are the same as for rebase. */
8022 10604dce 2021-09-24 thomas ok_arg.worktree = worktree;
8023 10604dce 2021-09-24 thomas ok_arg.repo = repo;
8024 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8025 10604dce 2021-09-24 thomas &ok_arg);
8026 10604dce 2021-09-24 thomas if (err)
8027 10604dce 2021-09-24 thomas goto done;
8029 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
8030 10604dce 2021-09-24 thomas if (err)
8031 10604dce 2021-09-24 thomas return err;
8033 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
8034 10604dce 2021-09-24 thomas if (err)
8035 10604dce 2021-09-24 thomas return err;
8037 10604dce 2021-09-24 thomas err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8039 10604dce 2021-09-24 thomas if (err)
8040 10604dce 2021-09-24 thomas goto done;
8042 10604dce 2021-09-24 thomas err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8043 10604dce 2021-09-24 thomas if (err)
8044 10604dce 2021-09-24 thomas goto done;
8046 10604dce 2021-09-24 thomas if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8047 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8048 10604dce 2021-09-24 thomas goto done;
8051 10604dce 2021-09-24 thomas err = got_ref_resolve(&branch_tip, repo, branch);
8052 10604dce 2021-09-24 thomas if (err)
8053 10604dce 2021-09-24 thomas goto done;
8055 10604dce 2021-09-24 thomas err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8056 10604dce 2021-09-24 thomas if (err)
8057 10604dce 2021-09-24 thomas goto done;
8058 10604dce 2021-09-24 thomas err = got_ref_write(branch_ref, repo);
8059 10604dce 2021-09-24 thomas if (err)
8060 10604dce 2021-09-24 thomas goto done;
8062 10604dce 2021-09-24 thomas err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8063 10604dce 2021-09-24 thomas if (err)
8064 10604dce 2021-09-24 thomas goto done;
8065 10604dce 2021-09-24 thomas err = got_ref_write(commit_ref, repo);
8066 10604dce 2021-09-24 thomas if (err)
8067 10604dce 2021-09-24 thomas goto done;
8070 10604dce 2021-09-24 thomas free(branch_refname);
8071 10604dce 2021-09-24 thomas free(commit_refname);
8072 10604dce 2021-09-24 thomas free(fileindex_path);
8073 10604dce 2021-09-24 thomas if (branch_ref)
8074 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
8075 10604dce 2021-09-24 thomas if (commit_ref)
8076 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
8077 10604dce 2021-09-24 thomas if (wt_branch)
8078 10604dce 2021-09-24 thomas got_ref_close(wt_branch);
8079 10604dce 2021-09-24 thomas free(wt_branch_tip);
8080 10604dce 2021-09-24 thomas if (err) {
8081 10604dce 2021-09-24 thomas if (*fileindex) {
8082 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
8083 10604dce 2021-09-24 thomas *fileindex = NULL;
8085 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
8087 10604dce 2021-09-24 thomas return err;
8090 10604dce 2021-09-24 thomas const struct got_error *
8091 10604dce 2021-09-24 thomas got_worktree_merge_continue(char **branch_name,
8092 10604dce 2021-09-24 thomas struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8093 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_repository *repo)
8095 10604dce 2021-09-24 thomas const struct got_error *err;
8096 10604dce 2021-09-24 thomas char *commit_refname = NULL, *branch_refname = NULL;
8097 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8098 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
8099 10604dce 2021-09-24 thomas int have_staged_files = 0;
8101 10604dce 2021-09-24 thomas *branch_name = NULL;
8102 10604dce 2021-09-24 thomas *branch_tip = NULL;
8103 10604dce 2021-09-24 thomas *fileindex = NULL;
8105 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
8106 10604dce 2021-09-24 thomas if (err)
8107 10604dce 2021-09-24 thomas return err;
8109 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
8110 10604dce 2021-09-24 thomas if (err)
8111 10604dce 2021-09-24 thomas goto done;
8113 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8114 10604dce 2021-09-24 thomas &have_staged_files);
8115 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
8116 10604dce 2021-09-24 thomas goto done;
8117 10604dce 2021-09-24 thomas if (have_staged_files) {
8118 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_STAGED_PATHS);
8119 10604dce 2021-09-24 thomas goto done;
8122 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
8123 10604dce 2021-09-24 thomas if (err)
8124 10604dce 2021-09-24 thomas goto done;
8126 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
8127 10604dce 2021-09-24 thomas if (err)
8128 10604dce 2021-09-24 thomas goto done;
8130 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8131 10604dce 2021-09-24 thomas if (err)
8132 10604dce 2021-09-24 thomas goto done;
8134 10604dce 2021-09-24 thomas if (!got_ref_is_symbolic(branch_ref)) {
8135 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8136 10604dce 2021-09-24 thomas "%s is not a symbolic reference",
8137 10604dce 2021-09-24 thomas got_ref_get_name(branch_ref));
8138 10604dce 2021-09-24 thomas goto done;
8140 10604dce 2021-09-24 thomas *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8141 10604dce 2021-09-24 thomas if (*branch_name == NULL) {
8142 10604dce 2021-09-24 thomas err = got_error_from_errno("strdup");
8143 10604dce 2021-09-24 thomas goto done;
8146 10604dce 2021-09-24 thomas err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8147 10604dce 2021-09-24 thomas if (err)
8148 10604dce 2021-09-24 thomas goto done;
8150 10604dce 2021-09-24 thomas err = got_ref_resolve(branch_tip, repo, commit_ref);
8151 10604dce 2021-09-24 thomas if (err)
8152 10604dce 2021-09-24 thomas goto done;
8154 10604dce 2021-09-24 thomas free(commit_refname);
8155 10604dce 2021-09-24 thomas free(branch_refname);
8156 10604dce 2021-09-24 thomas free(fileindex_path);
8157 10604dce 2021-09-24 thomas if (commit_ref)
8158 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
8159 10604dce 2021-09-24 thomas if (branch_ref)
8160 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
8161 10604dce 2021-09-24 thomas if (err) {
8162 10604dce 2021-09-24 thomas if (*branch_name) {
8163 10604dce 2021-09-24 thomas free(*branch_name);
8164 10604dce 2021-09-24 thomas *branch_name = NULL;
8166 10604dce 2021-09-24 thomas free(*branch_tip);
8167 10604dce 2021-09-24 thomas *branch_tip = NULL;
8168 10604dce 2021-09-24 thomas if (*fileindex) {
8169 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
8170 10604dce 2021-09-24 thomas *fileindex = NULL;
8172 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
8174 10604dce 2021-09-24 thomas return err;
8177 10604dce 2021-09-24 thomas const struct got_error *
8178 10604dce 2021-09-24 thomas got_worktree_merge_abort(struct got_worktree *worktree,
8179 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo,
8180 10604dce 2021-09-24 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
8182 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
8183 10604dce 2021-09-24 thomas struct got_object_id *commit_id = NULL;
8184 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
8185 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
8186 10604dce 2021-09-24 thomas struct revert_file_args rfa;
8187 10604dce 2021-09-24 thomas struct got_object_id *tree_id = NULL;
8189 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
8190 945f9229 2022-04-16 thomas worktree->base_commit_id);
8191 945f9229 2022-04-16 thomas if (err)
8192 945f9229 2022-04-16 thomas goto done;
8194 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
8195 945f9229 2022-04-16 thomas worktree->path_prefix);
8196 10604dce 2021-09-24 thomas if (err)
8197 10604dce 2021-09-24 thomas goto done;
8199 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
8200 10604dce 2021-09-24 thomas if (err)
8201 10604dce 2021-09-24 thomas goto done;
8203 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
8204 10604dce 2021-09-24 thomas if (err)
8205 10604dce 2021-09-24 thomas goto done;
8207 10604dce 2021-09-24 thomas rfa.worktree = worktree;
8208 10604dce 2021-09-24 thomas rfa.fileindex = fileindex;
8209 10604dce 2021-09-24 thomas rfa.progress_cb = progress_cb;
8210 10604dce 2021-09-24 thomas rfa.progress_arg = progress_arg;
8211 10604dce 2021-09-24 thomas rfa.patch_cb = NULL;
8212 10604dce 2021-09-24 thomas rfa.patch_arg = NULL;
8213 10604dce 2021-09-24 thomas rfa.repo = repo;
8214 10604dce 2021-09-24 thomas rfa.unlink_added_files = 1;
8215 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
8216 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
8217 10604dce 2021-09-24 thomas if (err)
8218 10604dce 2021-09-24 thomas goto sync;
8220 10604dce 2021-09-24 thomas err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8221 10604dce 2021-09-24 thomas repo, progress_cb, progress_arg, NULL, NULL);
8223 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
8224 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
8225 10604dce 2021-09-24 thomas err = sync_err;
8227 10604dce 2021-09-24 thomas free(tree_id);
8228 10604dce 2021-09-24 thomas free(commit_id);
8229 945f9229 2022-04-16 thomas if (commit)
8230 945f9229 2022-04-16 thomas got_object_commit_close(commit);
8231 10604dce 2021-09-24 thomas if (fileindex)
8232 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
8233 10604dce 2021-09-24 thomas free(fileindex_path);
8235 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
8236 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
8237 10604dce 2021-09-24 thomas err = unlockerr;
8238 10604dce 2021-09-24 thomas return err;
8241 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
8242 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
8243 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8244 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8245 2db2652d 2019-08-07 stsp struct got_repository *repo;
8246 2db2652d 2019-08-07 stsp int have_changes;
8249 ef20f542 2022-06-26 thomas static const struct got_error *
8250 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
8251 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8252 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8253 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8255 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
8256 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
8257 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
8258 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
8259 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
8260 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
8262 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
8263 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
8264 8b13ce36 2019-08-08 stsp return NULL;
8265 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
8266 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
8268 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8269 735ef5ac 2019-08-03 stsp if (ie == NULL)
8270 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8272 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8273 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8274 735ef5ac 2019-08-03 stsp relpath) == -1)
8275 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
8277 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
8278 43010591 2023-02-17 thomas base_commit_idp = got_fileindex_entry_get_commit_id(
8279 43010591 2023-02-17 thomas &base_commit_id, ie);
8282 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
8283 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8284 3aa5969e 2019-08-06 stsp goto done;
8285 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
8286 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
8287 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
8288 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8289 735ef5ac 2019-08-03 stsp goto done;
8292 2db2652d 2019-08-07 stsp a->have_changes = 1;
8294 735ef5ac 2019-08-03 stsp p = in_repo_path;
8295 735ef5ac 2019-08-03 stsp while (p[0] == '/')
8297 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
8298 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
8299 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
8301 735ef5ac 2019-08-03 stsp free(in_repo_path);
8302 dc424a06 2019-08-07 stsp return err;
8305 2db2652d 2019-08-07 stsp struct stage_path_arg {
8306 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8307 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8308 2db2652d 2019-08-07 stsp struct got_repository *repo;
8309 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
8310 2db2652d 2019-08-07 stsp void *status_arg;
8311 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
8312 2db2652d 2019-08-07 stsp void *patch_arg;
8313 7b5dc508 2019-10-28 stsp int staged_something;
8314 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
8317 2db2652d 2019-08-07 stsp static const struct got_error *
8318 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
8319 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8320 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8321 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8323 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8324 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8325 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8326 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8327 0cb83759 2019-08-03 stsp uint32_t stage;
8328 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8329 0aeb8099 2020-07-23 stsp struct stat sb;
8331 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8332 8b13ce36 2019-08-08 stsp return NULL;
8334 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8335 d3e7c587 2019-08-03 stsp if (ie == NULL)
8336 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8338 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8339 2db2652d 2019-08-07 stsp relpath)== -1)
8340 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8342 0cb83759 2019-08-03 stsp switch (status) {
8343 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8344 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8345 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8346 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8347 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8350 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8351 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8352 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8353 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8354 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8357 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8360 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8361 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8362 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8363 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8364 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8368 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8369 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8372 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8373 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8374 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8375 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8377 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8378 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8379 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8380 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8381 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8382 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8383 35213c7c 2020-07-23 stsp ssize_t target_len;
8384 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8385 35213c7c 2020-07-23 stsp sizeof(target_path));
8386 35213c7c 2020-07-23 stsp if (target_len == -1) {
8387 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8388 35213c7c 2020-07-23 stsp ondisk_path);
8391 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8392 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8393 35213c7c 2020-07-23 stsp a->worktree->root_path);
8396 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8397 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8398 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8402 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8403 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8404 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8406 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8407 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8409 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8410 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8412 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8413 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8415 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8416 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8417 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8418 f289c82c 2022-06-13 thomas if (err)
8421 f289c82c 2022-06-13 thomas * When staging the reverse of the staged diff,
8422 f289c82c 2022-06-13 thomas * implicitly unstage the file.
8424 f289c82c 2022-06-13 thomas if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8425 f289c82c 2022-06-13 thomas sizeof(ie->blob_sha1)) == 0) {
8426 f289c82c 2022-06-13 thomas got_fileindex_entry_stage_set(ie,
8427 f289c82c 2022-06-13 thomas GOT_FILEIDX_STAGE_NONE);
8430 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8431 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8433 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8434 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8435 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8436 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8439 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8441 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8442 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8446 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8447 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8448 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8449 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8451 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8452 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8455 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8457 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8458 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8460 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8461 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8464 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8468 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8469 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8470 dc424a06 2019-08-07 stsp free(path_content);
8471 2db2652d 2019-08-07 stsp free(ondisk_path);
8472 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8473 0ebf8283 2019-07-24 stsp return err;
8476 0cb83759 2019-08-03 stsp const struct got_error *
8477 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8478 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8479 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8480 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8481 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8483 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8484 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8485 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8486 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8487 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8488 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8489 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8490 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8492 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8494 0cb83759 2019-08-03 stsp return err;
8496 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8497 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8499 735ef5ac 2019-08-03 stsp goto done;
8500 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8502 735ef5ac 2019-08-03 stsp goto done;
8503 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8505 0cb83759 2019-08-03 stsp goto done;
8507 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8508 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8509 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8510 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8511 2db2652d 2019-08-07 stsp oka.repo = repo;
8512 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8513 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8514 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8515 6092c299 2021-10-04 thomas check_stage_ok, &oka, NULL, NULL, 1, 0);
8517 735ef5ac 2019-08-03 stsp goto done;
8519 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8520 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8521 2db2652d 2019-08-07 stsp goto done;
8524 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8525 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8526 2db2652d 2019-08-07 stsp spa.repo = repo;
8527 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8528 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8529 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8530 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8531 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8532 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8533 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8534 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8535 6092c299 2021-10-04 thomas stage_path, &spa, NULL, NULL, 1, 0);
8537 2db2652d 2019-08-07 stsp goto done;
8539 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8540 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8541 7b5dc508 2019-10-28 stsp goto done;
8544 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8545 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8546 0cb83759 2019-08-03 stsp err = sync_err;
8548 735ef5ac 2019-08-03 stsp if (head_ref)
8549 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8550 735ef5ac 2019-08-03 stsp free(head_commit_id);
8551 0cb83759 2019-08-03 stsp free(fileindex_path);
8552 0cb83759 2019-08-03 stsp if (fileindex)
8553 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8554 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8555 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8556 0cb83759 2019-08-03 stsp err = unlockerr;
8557 0cb83759 2019-08-03 stsp return err;
8560 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8561 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8562 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8563 ad493afc 2019-08-03 stsp struct got_repository *repo;
8564 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8565 ad493afc 2019-08-03 stsp void *progress_arg;
8566 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8567 2e1f37b0 2019-08-08 stsp void *patch_arg;
8570 2e1f37b0 2019-08-08 stsp static const struct got_error *
8571 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8572 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8573 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8574 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8575 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8577 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8578 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8579 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8580 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8581 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8582 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8583 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8584 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
8586 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8587 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8589 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8591 2e1f37b0 2019-08-08 stsp return err;
8593 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
8594 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
8595 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8596 f4ae6ddb 2022-07-01 thomas goto done;
8598 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
8599 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
8600 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8601 f4ae6ddb 2022-07-01 thomas goto done;
8604 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8606 2e1f37b0 2019-08-08 stsp goto done;
8608 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8610 2e1f37b0 2019-08-08 stsp goto done;
8612 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8614 2e1f37b0 2019-08-08 stsp goto done;
8616 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8619 2e1f37b0 2019-08-08 stsp goto done;
8621 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8623 2e1f37b0 2019-08-08 stsp goto done;
8625 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8627 2e1f37b0 2019-08-08 stsp goto done;
8629 dd2e2f52 2022-07-01 thomas err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8630 25ec7006 2022-07-01 thomas path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8632 2e1f37b0 2019-08-08 stsp goto done;
8634 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8635 fc2a50f2 2022-11-01 thomas "got-unstaged-content", "");
8637 2e1f37b0 2019-08-08 stsp goto done;
8638 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8639 fc2a50f2 2022-11-01 thomas "got-new-staged-content", "");
8641 2e1f37b0 2019-08-08 stsp goto done;
8643 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8644 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8645 2e1f37b0 2019-08-08 stsp goto done;
8647 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8648 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8649 2e1f37b0 2019-08-08 stsp goto done;
8651 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8652 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8653 f4ae6ddb 2022-07-01 thomas struct diff_chunk_context cc = {};
8654 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8655 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8656 fe621944 2020-11-10 stsp nchanges++;
8658 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8659 2e1f37b0 2019-08-08 stsp int choice;
8660 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8661 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8662 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8663 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8665 2e1f37b0 2019-08-08 stsp goto done;
8666 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8667 2e1f37b0 2019-08-08 stsp have_content = 1;
8669 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8670 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8673 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8674 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8675 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8677 2e1f37b0 2019-08-08 stsp free(label1);
8678 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8679 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8681 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8682 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8683 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8684 2e1f37b0 2019-08-08 stsp if (staged_blob)
8685 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8686 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8687 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8688 fe621944 2020-11-10 stsp err = free_err;
8689 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8690 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8691 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8692 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8693 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8694 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8695 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8696 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8697 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8698 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8699 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8700 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8701 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8702 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8703 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8704 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8705 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8706 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8707 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8709 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8710 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8711 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8712 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8713 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8714 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8715 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8717 2e1f37b0 2019-08-08 stsp free(path1);
8718 2e1f37b0 2019-08-08 stsp free(path2);
8719 fda8017d 2020-07-23 stsp return err;
8722 fda8017d 2020-07-23 stsp static const struct got_error *
8723 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8724 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8725 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8726 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8727 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8728 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8729 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8731 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8732 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8733 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8734 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8735 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8736 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8737 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8738 fda8017d 2020-07-23 stsp struct stat sb;
8740 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8741 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8742 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8744 fda8017d 2020-07-23 stsp return err;
8746 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8747 fda8017d 2020-07-23 stsp return NULL;
8749 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8750 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8751 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8753 fda8017d 2020-07-23 stsp goto done;
8756 c56c5d8a 2021-12-31 thomas f = fopen(path_unstaged_content, "re");
8757 fda8017d 2020-07-23 stsp if (f == NULL) {
8758 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8759 fda8017d 2020-07-23 stsp path_unstaged_content);
8760 fda8017d 2020-07-23 stsp goto done;
8762 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8763 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8764 fda8017d 2020-07-23 stsp goto done;
8766 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8767 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8768 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8770 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8771 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8772 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8773 fda8017d 2020-07-23 stsp goto done;
8775 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8776 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8777 fda8017d 2020-07-23 stsp goto done;
8779 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8780 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8781 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8782 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8783 fda8017d 2020-07-23 stsp progress_arg);
8785 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8787 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8789 67a66647 2021-05-31 stsp return err;
8791 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8792 67a66647 2021-05-31 stsp parent) == -1) {
8793 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8794 67a66647 2021-05-31 stsp base_path = NULL;
8795 67a66647 2021-05-31 stsp goto done;
8798 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&blob_base_path, &f_base,
8799 fc2a50f2 2022-11-01 thomas base_path, "");
8801 67a66647 2021-05-31 stsp goto done;
8802 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8803 67a66647 2021-05-31 stsp blob_base);
8805 67a66647 2021-05-31 stsp goto done;
8808 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8809 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8811 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8812 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8813 eec2f5a9 2021-06-03 stsp ondisk_path);
8815 eec2f5a9 2021-06-03 stsp goto done;
8818 06340621 2021-12-31 thomas fd = open(ondisk_path,
8819 06340621 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8820 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8821 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8822 eec2f5a9 2021-06-03 stsp goto done;
8824 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8825 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8826 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8827 eec2f5a9 2021-06-03 stsp close(fd);
8828 eec2f5a9 2021-06-03 stsp goto done;
8832 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8833 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8834 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8835 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8836 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8839 fda8017d 2020-07-23 stsp goto done;
8841 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8842 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8843 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8845 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8846 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8849 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8850 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8851 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8852 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8853 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8854 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8855 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8856 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8857 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8858 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8859 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8860 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8861 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8862 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8863 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8864 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8865 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8866 67a66647 2021-05-31 stsp free(blob_base_path);
8867 67a66647 2021-05-31 stsp free(parent);
8868 67a66647 2021-05-31 stsp free(base_path);
8869 2e1f37b0 2019-08-08 stsp return err;
8872 ad493afc 2019-08-03 stsp static const struct got_error *
8873 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8874 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8875 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8876 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8878 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8879 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8880 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8881 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8882 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8883 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8884 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8885 9bc94a15 2019-08-03 stsp struct stat sb;
8886 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
8888 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8889 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8890 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8891 2e1f37b0 2019-08-08 stsp return NULL;
8893 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8894 ad493afc 2019-08-03 stsp if (ie == NULL)
8895 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8897 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8899 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8901 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8902 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8904 f69721c3 2019-10-21 stsp goto done;
8905 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8906 f69721c3 2019-10-21 stsp id_str) == -1) {
8907 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8908 f4ae6ddb 2022-07-01 thomas goto done;
8911 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
8912 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
8913 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8914 f4ae6ddb 2022-07-01 thomas goto done;
8916 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
8917 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
8918 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8919 f69721c3 2019-10-21 stsp goto done;
8922 ad493afc 2019-08-03 stsp switch (staged_status) {
8923 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8924 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8925 f4ae6ddb 2022-07-01 thomas blob_id, 8192, fd1);
8928 ad493afc 2019-08-03 stsp /* fall through */
8929 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8930 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8931 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8932 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8933 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8934 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8937 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8940 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8941 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8942 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8943 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8944 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8945 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8948 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8949 f4ae6ddb 2022-07-01 thomas staged_blob_id, 8192, fd2);
8952 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8953 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8954 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8955 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8956 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8957 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8958 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8959 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8960 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8962 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8963 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8964 36bf999c 2020-07-23 stsp char *staged_target;
8965 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8966 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8968 36bf999c 2020-07-23 stsp goto done;
8969 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8970 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8971 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8972 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8973 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8974 36bf999c 2020-07-23 stsp free(staged_target);
8976 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8977 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8978 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8979 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8980 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8981 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8982 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8986 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8989 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8990 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8991 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8992 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8995 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8996 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8997 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8998 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8999 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9002 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
9004 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
9005 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
9009 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9010 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9011 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
9012 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
9015 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
9019 ad493afc 2019-08-03 stsp free(ondisk_path);
9020 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9021 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
9022 ad493afc 2019-08-03 stsp if (blob_base)
9023 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
9024 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9025 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
9026 ad493afc 2019-08-03 stsp if (blob_staged)
9027 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
9028 f69721c3 2019-10-21 stsp free(id_str);
9029 f69721c3 2019-10-21 stsp free(label_orig);
9030 ad493afc 2019-08-03 stsp return err;
9033 ad493afc 2019-08-03 stsp const struct got_error *
9034 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
9035 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
9036 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
9037 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
9038 ad493afc 2019-08-03 stsp struct got_repository *repo)
9040 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
9041 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9042 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
9043 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
9044 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
9046 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
9048 ad493afc 2019-08-03 stsp return err;
9050 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9052 ad493afc 2019-08-03 stsp goto done;
9054 ad493afc 2019-08-03 stsp upa.worktree = worktree;
9055 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
9056 ad493afc 2019-08-03 stsp upa.repo = repo;
9057 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
9058 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
9059 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
9060 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
9061 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
9062 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
9063 6092c299 2021-10-04 thomas unstage_path, &upa, NULL, NULL, 1, 0);
9065 ad493afc 2019-08-03 stsp goto done;
9068 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
9069 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
9070 ad493afc 2019-08-03 stsp err = sync_err;
9072 ad493afc 2019-08-03 stsp free(fileindex_path);
9073 ad493afc 2019-08-03 stsp if (fileindex)
9074 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
9075 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
9076 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
9077 ad493afc 2019-08-03 stsp err = unlockerr;
9078 ad493afc 2019-08-03 stsp return err;
9081 b2118c49 2020-07-28 stsp struct report_file_info_arg {
9082 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
9083 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
9084 b2118c49 2020-07-28 stsp void *info_arg;
9085 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
9086 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
9087 b2118c49 2020-07-28 stsp void *cancel_arg;
9090 b2118c49 2020-07-28 stsp static const struct got_error *
9091 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
9093 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
9094 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9095 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
9096 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9097 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
9098 b2118c49 2020-07-28 stsp int stage;
9100 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9101 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
9103 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
9104 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9105 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
9108 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
9109 b2118c49 2020-07-28 stsp return NULL;
9111 43010591 2023-02-17 thomas if (got_fileindex_entry_has_blob(ie))
9112 43010591 2023-02-17 thomas blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
9113 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
9114 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9115 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
9116 43010591 2023-02-17 thomas staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
9117 43010591 2023-02-17 thomas &staged_blob_id, ie);
9120 43010591 2023-02-17 thomas if (got_fileindex_entry_has_commit(ie))
9121 43010591 2023-02-17 thomas commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
9123 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9124 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9127 b2118c49 2020-07-28 stsp const struct got_error *
9128 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
9129 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
9130 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
9131 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
9134 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
9135 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
9136 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
9137 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
9139 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
9141 b2118c49 2020-07-28 stsp return err;
9143 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9145 b2118c49 2020-07-28 stsp goto done;
9147 b2118c49 2020-07-28 stsp arg.worktree = worktree;
9148 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
9149 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
9150 b2118c49 2020-07-28 stsp arg.paths = paths;
9151 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
9152 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
9153 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9156 b2118c49 2020-07-28 stsp free(fileindex_path);
9157 b2118c49 2020-07-28 stsp if (fileindex)
9158 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
9159 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
9160 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
9161 b2118c49 2020-07-28 stsp err = unlockerr;
9162 b2118c49 2020-07-28 stsp return err;
9165 814624e7 2022-03-22 thomas static const struct got_error *
9166 814624e7 2022-03-22 thomas patch_check_path(const char *p, char **path, unsigned char *status,
9167 814624e7 2022-03-22 thomas unsigned char *staged_status, struct got_fileindex *fileindex,
9168 814624e7 2022-03-22 thomas struct got_worktree *worktree, struct got_repository *repo)
9170 814624e7 2022-03-22 thomas const struct got_error *err;
9171 814624e7 2022-03-22 thomas struct got_fileindex_entry *ie;
9172 814624e7 2022-03-22 thomas struct stat sb;
9173 814624e7 2022-03-22 thomas char *ondisk_path = NULL;
9175 814624e7 2022-03-22 thomas err = got_worktree_resolve_path(path, worktree, p);
9176 814624e7 2022-03-22 thomas if (err)
9177 814624e7 2022-03-22 thomas return err;
9179 814624e7 2022-03-22 thomas if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9180 814624e7 2022-03-22 thomas *path[0] ? "/" : "", *path) == -1)
9181 814624e7 2022-03-22 thomas return got_error_from_errno("asprintf");
9183 814624e7 2022-03-22 thomas ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9184 814624e7 2022-03-22 thomas if (ie) {
9185 814624e7 2022-03-22 thomas *staged_status = get_staged_status(ie);
9186 12de5570 2022-05-01 thomas err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9188 814624e7 2022-03-22 thomas if (err)
9189 814624e7 2022-03-22 thomas goto done;
9190 814624e7 2022-03-22 thomas } else {
9191 814624e7 2022-03-22 thomas *staged_status = GOT_STATUS_NO_CHANGE;
9192 814624e7 2022-03-22 thomas *status = GOT_STATUS_UNVERSIONED;
9193 814624e7 2022-03-22 thomas if (lstat(ondisk_path, &sb) == -1) {
9194 814624e7 2022-03-22 thomas if (errno != ENOENT) {
9195 814624e7 2022-03-22 thomas err = got_error_from_errno2("lstat",
9196 814624e7 2022-03-22 thomas ondisk_path);
9197 814624e7 2022-03-22 thomas goto done;
9199 814624e7 2022-03-22 thomas *status = GOT_STATUS_NONEXISTENT;
9204 814624e7 2022-03-22 thomas free(ondisk_path);
9205 814624e7 2022-03-22 thomas return err;
9208 814624e7 2022-03-22 thomas static const struct got_error *
9209 814624e7 2022-03-22 thomas patch_can_rm(const char *path, unsigned char status,
9210 814624e7 2022-03-22 thomas unsigned char staged_status)
9212 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
9213 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
9214 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
9215 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
9216 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY &&
9217 814624e7 2022-03-22 thomas status != GOT_STATUS_MODE_CHANGE)
9218 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9219 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
9220 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9221 814624e7 2022-03-22 thomas return NULL;
9224 814624e7 2022-03-22 thomas static const struct got_error *
9225 814624e7 2022-03-22 thomas patch_can_add(const char *path, unsigned char status)
9227 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NONEXISTENT)
9228 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9229 814624e7 2022-03-22 thomas return NULL;
9232 814624e7 2022-03-22 thomas static const struct got_error *
9233 814624e7 2022-03-22 thomas patch_can_edit(const char *path, unsigned char status,
9234 814624e7 2022-03-22 thomas unsigned char staged_status)
9236 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
9237 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
9238 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
9239 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
9240 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY)
9241 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9242 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
9243 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9244 814624e7 2022-03-22 thomas return NULL;
9247 814624e7 2022-03-22 thomas const struct got_error *
9248 814624e7 2022-03-22 thomas got_worktree_patch_prepare(struct got_fileindex **fileindex,
9249 5e22b737 2022-05-31 thomas char **fileindex_path, struct got_worktree *worktree)
9251 5e22b737 2022-05-31 thomas return open_fileindex(fileindex, fileindex_path, worktree);
9254 814624e7 2022-03-22 thomas const struct got_error *
9255 814624e7 2022-03-22 thomas got_worktree_patch_check_path(const char *old, const char *new,
9256 814624e7 2022-03-22 thomas char **oldpath, char **newpath, struct got_worktree *worktree,
9257 814624e7 2022-03-22 thomas struct got_repository *repo, struct got_fileindex *fileindex)
9259 814624e7 2022-03-22 thomas const struct got_error *err = NULL;
9260 814624e7 2022-03-22 thomas int file_renamed = 0;
9261 814624e7 2022-03-22 thomas unsigned char status_old, staged_status_old;
9262 814624e7 2022-03-22 thomas unsigned char status_new, staged_status_new;
9264 814624e7 2022-03-22 thomas *oldpath = NULL;
9265 814624e7 2022-03-22 thomas *newpath = NULL;
9267 814624e7 2022-03-22 thomas err = patch_check_path(old != NULL ? old : new, oldpath,
9268 814624e7 2022-03-22 thomas &status_old, &staged_status_old, fileindex, worktree, repo);
9269 814624e7 2022-03-22 thomas if (err)
9270 814624e7 2022-03-22 thomas goto done;
9272 814624e7 2022-03-22 thomas err = patch_check_path(new != NULL ? new : old, newpath,
9273 814624e7 2022-03-22 thomas &status_new, &staged_status_new, fileindex, worktree, repo);
9274 814624e7 2022-03-22 thomas if (err)
9275 814624e7 2022-03-22 thomas goto done;
9277 814624e7 2022-03-22 thomas if (old != NULL && new != NULL && strcmp(old, new) != 0)
9278 814624e7 2022-03-22 thomas file_renamed = 1;
9280 814624e7 2022-03-22 thomas if (old != NULL && new == NULL)
9281 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
9282 814624e7 2022-03-22 thomas else if (file_renamed) {
9283 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
9284 814624e7 2022-03-22 thomas if (err == NULL)
9285 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
9286 814624e7 2022-03-22 thomas } else if (old == NULL)
9287 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
9289 814624e7 2022-03-22 thomas err = patch_can_edit(*newpath, status_new, staged_status_new);
9292 814624e7 2022-03-22 thomas if (err) {
9293 814624e7 2022-03-22 thomas free(*oldpath);
9294 814624e7 2022-03-22 thomas *oldpath = NULL;
9295 814624e7 2022-03-22 thomas free(*newpath);
9296 814624e7 2022-03-22 thomas *newpath = NULL;
9298 814624e7 2022-03-22 thomas return err;
9301 814624e7 2022-03-22 thomas const struct got_error *
9302 5e22b737 2022-05-31 thomas got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9303 5e22b737 2022-05-31 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
9304 5e22b737 2022-05-31 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
9306 5e22b737 2022-05-31 thomas struct schedule_addition_args saa;
9308 5e22b737 2022-05-31 thomas memset(&saa, 0, sizeof(saa));
9309 5e22b737 2022-05-31 thomas saa.worktree = worktree;
9310 5e22b737 2022-05-31 thomas saa.fileindex = fileindex;
9311 5e22b737 2022-05-31 thomas saa.progress_cb = progress_cb;
9312 5e22b737 2022-05-31 thomas saa.progress_arg = progress_arg;
9313 5e22b737 2022-05-31 thomas saa.repo = repo;
9315 5e22b737 2022-05-31 thomas return worktree_status(worktree, path, fileindex, repo,
9316 5e22b737 2022-05-31 thomas schedule_addition, &saa, NULL, NULL, 1, 0);
9319 5e22b737 2022-05-31 thomas const struct got_error *
9320 5e22b737 2022-05-31 thomas got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9321 5e22b737 2022-05-31 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
9322 5e22b737 2022-05-31 thomas got_worktree_delete_cb progress_cb, void *progress_arg)
9324 5e22b737 2022-05-31 thomas struct schedule_deletion_args sda;
9326 5e22b737 2022-05-31 thomas memset(&sda, 0, sizeof(sda));
9327 5e22b737 2022-05-31 thomas sda.worktree = worktree;
9328 5e22b737 2022-05-31 thomas sda.fileindex = fileindex;
9329 5e22b737 2022-05-31 thomas sda.progress_cb = progress_cb;
9330 5e22b737 2022-05-31 thomas sda.progress_arg = progress_arg;
9331 5e22b737 2022-05-31 thomas sda.repo = repo;
9332 5e22b737 2022-05-31 thomas sda.delete_local_mods = 0;
9333 5e22b737 2022-05-31 thomas sda.keep_on_disk = 0;
9334 5e22b737 2022-05-31 thomas sda.ignore_missing_paths = 0;
9335 5e22b737 2022-05-31 thomas sda.status_codes = NULL;
9337 5e22b737 2022-05-31 thomas return worktree_status(worktree, path, fileindex, repo,
9338 5e22b737 2022-05-31 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9341 5e22b737 2022-05-31 thomas const struct got_error *
9342 5e22b737 2022-05-31 thomas got_worktree_patch_complete(struct got_fileindex *fileindex,
9343 36832a8e 2022-05-31 thomas const char *fileindex_path)
9345 5e22b737 2022-05-31 thomas const struct got_error *err = NULL;
9347 36832a8e 2022-05-31 thomas err = sync_fileindex(fileindex, fileindex_path);
9348 36832a8e 2022-05-31 thomas got_fileindex_free(fileindex);
9350 5e22b737 2022-05-31 thomas return err;
