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 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1652 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1653 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1656 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1657 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1658 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1660 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1661 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1662 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1663 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1664 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1666 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1667 882ef1b9 2019-12-13 stsp goto done;
1669 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1670 3d35a492 2019-12-13 stsp goto done;
1673 06340621 2021-12-31 thomas fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1674 3dc1dc04 2021-09-27 thomas if (fd == -1 && errno != ENOENT &&
1675 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
1676 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1677 3dc1dc04 2021-09-27 thomas else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1678 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1679 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1680 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1681 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1682 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1683 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1685 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1686 3d35a492 2019-12-13 stsp goto done;
1688 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1689 1338848f 2019-12-13 stsp goto done;
1693 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1694 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1695 1338848f 2019-12-13 stsp goto done;
1698 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1699 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1700 1338848f 2019-12-13 stsp goto done;
1701 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1702 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1703 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1704 1338848f 2019-12-13 stsp goto done;
1707 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1708 f179e66d 2020-07-23 stsp goto done;
1710 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1711 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1712 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1713 1338848f 2019-12-13 stsp goto done;
1716 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1717 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1718 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1720 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1722 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
1723 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
1724 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1725 f4ae6ddb 2022-07-01 thomas goto done;
1727 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1729 1338848f 2019-12-13 stsp goto done;
1731 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1732 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1733 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1734 a919d5c4 2020-07-23 stsp goto done;
1737 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1738 fc63f50d 2021-12-31 thomas fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1739 ab0d4361 2019-12-13 stsp if (fd == -1) {
1740 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1741 ab0d4361 2019-12-13 stsp goto done;
1745 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1746 6353ad76 2019-02-08 stsp if (f == NULL) {
1747 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1748 6353ad76 2019-02-08 stsp goto done;
1751 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1753 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1754 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1756 7154f6ce 2019-03-27 stsp goto done;
1757 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1758 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1759 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1760 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1761 7154f6ce 2019-03-27 stsp goto done;
1763 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1764 6353ad76 2019-02-08 stsp if (flen != 0)
1765 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1767 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1768 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1769 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1771 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1772 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1773 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1774 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1778 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1781 6353ad76 2019-02-08 stsp hdrlen = 0;
1784 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1785 7154f6ce 2019-03-27 stsp rewind(f);
1786 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1787 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1788 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1790 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1791 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
1793 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1794 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1795 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1796 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1797 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1798 9d31a1d8 2018-03-11 stsp return err;
1802 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1803 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1805 e2b1e152 2019-07-13 stsp static const struct got_error *
1806 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1807 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1809 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1810 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1811 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1813 e2b1e152 2019-07-13 stsp return NULL;
1816 9d31a1d8 2018-03-11 stsp static const struct got_error *
1817 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1818 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1819 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1820 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1821 0584f854 2019-04-06 stsp void *progress_arg)
1823 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1824 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1825 f4ae6ddb 2022-07-01 thomas char *ondisk_path = NULL;
1826 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1827 b8f41171 2019-02-10 stsp struct stat sb;
1828 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
1830 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1831 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1834 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1835 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1836 a76c42e6 2019-08-03 stsp goto done;
1838 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1841 abb4604f 2019-07-27 stsp goto done;
1842 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1843 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1845 e6f4ba31 2021-09-24 thomas if (stat(ondisk_path, &sb) == -1) {
1846 e6f4ba31 2021-09-24 thomas if (errno != ENOENT) {
1847 e6f4ba31 2021-09-24 thomas err = got_error_from_errno2("stat",
1848 e6f4ba31 2021-09-24 thomas ondisk_path);
1849 e6f4ba31 2021-09-24 thomas goto done;
1851 e6f4ba31 2021-09-24 thomas sb.st_mode = GOT_DEFAULT_FILE_MODE;
1852 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1853 e6f4ba31 2021-09-24 thomas } else {
1854 e6f4ba31 2021-09-24 thomas if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1855 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_UNVERSIONED;
1857 e6f4ba31 2021-09-24 thomas status = GOT_STATUS_OBSTRUCTED;
1861 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1863 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1864 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1865 b8f41171 2019-02-10 stsp goto done;
1867 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1869 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1870 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1872 5036ab18 2020-04-18 stsp goto done;
1875 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1876 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1877 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1879 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1880 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1881 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1882 c6e8a826 2021-04-05 stsp * updating contents of this file.
1884 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1885 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1886 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1887 c6e8a826 2021-04-05 stsp /* Same commit. */
1888 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1889 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1891 e2b1e152 2019-07-13 stsp goto done;
1892 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1894 6353ad76 2019-02-08 stsp goto done;
1896 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1897 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1898 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1899 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1900 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1901 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1903 0f58026f 2021-04-05 stsp goto done;
1904 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1906 b8f41171 2019-02-10 stsp goto done;
1910 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
1911 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
1912 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1913 f4ae6ddb 2022-07-01 thomas goto done;
1915 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1917 6353ad76 2019-02-08 stsp goto done;
1919 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1920 234035bc 2019-06-01 stsp int update_timestamps;
1921 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1922 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1923 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1924 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
1925 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
1926 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
1927 f4ae6ddb 2022-07-01 thomas goto done;
1929 234035bc 2019-06-01 stsp struct got_object_id id2;
1930 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1931 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1934 f69721c3 2019-10-21 stsp goto done;
1936 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1937 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1938 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1939 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1940 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1941 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1942 f69721c3 2019-10-21 stsp goto done;
1944 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1945 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1946 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1947 234035bc 2019-06-01 stsp goto done;
1950 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1951 36bf999c 2020-07-23 stsp char *link_target;
1952 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1954 36bf999c 2020-07-23 stsp goto done;
1955 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1956 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1957 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1958 36bf999c 2020-07-23 stsp free(link_target);
1960 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1961 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1962 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1963 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1965 f69721c3 2019-10-21 stsp free(label_orig);
1966 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1967 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
1968 f4ae6ddb 2022-07-01 thomas goto done;
1970 234035bc 2019-06-01 stsp if (blob2)
1971 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1973 909d120e 2019-09-22 stsp goto done;
1975 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1976 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1977 234035bc 2019-06-01 stsp * unmodified files again.
1979 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1980 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1981 234035bc 2019-06-01 stsp update_timestamps);
1982 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1983 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1984 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1985 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1986 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1988 1ee397ad 2019-07-12 stsp goto done;
1989 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1990 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1992 13d9040b 2019-03-27 stsp goto done;
1994 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1995 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1996 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1997 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1998 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1999 ace90326 2021-09-27 thomas status == GOT_STATUS_UNVERSIONED, 0,
2000 ace90326 2021-09-27 thomas repo, progress_cb, progress_arg);
2002 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2003 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2004 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2005 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2006 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2009 13d9040b 2019-03-27 stsp goto done;
2012 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2013 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2014 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2016 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2017 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2018 054041d0 2020-06-24 stsp &blob->id);
2021 13d9040b 2019-03-27 stsp goto done;
2023 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2024 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2025 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2029 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2030 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
2031 f4ae6ddb 2022-07-01 thomas goto done;
2033 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2035 6353ad76 2019-02-08 stsp free(ondisk_path);
2036 8da9e5f4 2019-01-12 stsp return err;
2039 90285c3b 2019-01-08 stsp static const struct got_error *
2040 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2042 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2043 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2045 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2046 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2048 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2049 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2050 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2052 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2053 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2055 1c4cdd89 2021-06-20 stsp goto done;
2056 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2057 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2058 fddefe3b 2020-10-20 stsp free(ondisk_path);
2059 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2060 1c4cdd89 2021-06-20 stsp parent = NULL;
2061 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2062 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2063 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2064 fddefe3b 2020-10-20 stsp ondisk_path);
2067 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2073 90285c3b 2019-01-08 stsp free(ondisk_path);
2074 1c4cdd89 2021-06-20 stsp free(parent);
2075 90285c3b 2019-01-08 stsp return err;
2078 708d8e67 2019-03-27 stsp static const struct got_error *
2079 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2080 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2081 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2083 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2084 708d8e67 2019-03-27 stsp unsigned char status;
2085 708d8e67 2019-03-27 stsp struct stat sb;
2086 708d8e67 2019-03-27 stsp char *ondisk_path;
2088 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2089 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2091 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2093 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2095 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2097 5a58a424 2020-06-23 stsp goto done;
2099 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2100 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2101 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2102 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2103 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2104 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2105 993e2a1b 2020-07-23 stsp goto done;
2107 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2108 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2109 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2110 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2112 993e2a1b 2020-07-23 stsp goto done;
2113 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2114 993e2a1b 2020-07-23 stsp ie->path);
2115 993e2a1b 2020-07-23 stsp goto done;
2118 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2119 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2120 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2122 5a58a424 2020-06-23 stsp goto done;
2124 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2125 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2127 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2128 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2130 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2132 5a58a424 2020-06-23 stsp goto done;
2133 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2134 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2136 5a58a424 2020-06-23 stsp goto done;
2138 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2141 5a58a424 2020-06-23 stsp free(ondisk_path);
2142 fc6346c4 2019-03-27 stsp return err;
2145 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2146 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2147 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2148 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2149 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2150 8da9e5f4 2019-01-12 stsp void *progress_arg;
2151 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2152 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2155 512f0d0e 2019-01-02 stsp static const struct got_error *
2156 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2157 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2159 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2161 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2162 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2164 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2165 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2168 8da9e5f4 2019-01-12 stsp static const struct got_error *
2169 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2171 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2173 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2174 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2176 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2177 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2180 9d31a1d8 2018-03-11 stsp static const struct got_error *
2181 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2183 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2184 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2185 8da9e5f4 2019-01-12 stsp char *path;
2187 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2188 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2190 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2191 63c5ca5d 2019-08-24 stsp return NULL;
2193 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2194 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2196 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2198 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2199 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2201 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2202 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2204 8da9e5f4 2019-01-12 stsp free(path);
2205 0cd1c46a 2019-03-11 stsp return err;
2208 b2118c49 2020-07-28 stsp const struct got_error *
2209 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2211 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2213 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2214 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2215 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2216 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2219 b2118c49 2020-07-28 stsp return NULL;
2222 818c7501 2019-07-11 stsp static const struct got_error *
2223 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2225 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2226 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2228 517bab73 2019-03-11 stsp *refname = NULL;
2230 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2232 b2118c49 2020-07-28 stsp return err;
2234 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2235 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2236 0647c563 2019-03-11 stsp *refname = NULL;
2238 517bab73 2019-03-11 stsp free(uuidstr);
2239 517bab73 2019-03-11 stsp return err;
2242 818c7501 2019-07-11 stsp const struct got_error *
2243 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2245 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2248 818c7501 2019-07-11 stsp static const struct got_error *
2249 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2251 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2252 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2255 818c7501 2019-07-11 stsp static const struct got_error *
2256 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2258 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2261 818c7501 2019-07-11 stsp static const struct got_error *
2262 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2264 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2265 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2268 818c7501 2019-07-11 stsp static const struct got_error *
2269 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2271 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2272 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2275 0ebf8283 2019-07-24 stsp static const struct got_error *
2276 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2278 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2279 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2282 0ebf8283 2019-07-24 stsp static const struct got_error *
2283 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2285 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2286 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2289 0ebf8283 2019-07-24 stsp static const struct got_error *
2290 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2292 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2293 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2296 0ebf8283 2019-07-24 stsp static const struct got_error *
2297 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2299 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2300 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2303 0ebf8283 2019-07-24 stsp const struct got_error *
2304 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2305 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2307 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2308 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2309 0ebf8283 2019-07-24 stsp *path = NULL;
2310 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2312 0ebf8283 2019-07-24 stsp return NULL;
2315 10604dce 2021-09-24 thomas static const struct got_error *
2316 10604dce 2021-09-24 thomas get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2318 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2319 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2322 10604dce 2021-09-24 thomas static const struct got_error *
2323 10604dce 2021-09-24 thomas get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2325 10604dce 2021-09-24 thomas return get_ref_name(refname, worktree,
2326 10604dce 2021-09-24 thomas GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2330 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2331 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2333 517bab73 2019-03-11 stsp static const struct got_error *
2334 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2336 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2337 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2338 517bab73 2019-03-11 stsp char *refname;
2340 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2342 517bab73 2019-03-11 stsp return err;
2344 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2346 0cd1c46a 2019-03-11 stsp goto done;
2348 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2350 0cd1c46a 2019-03-11 stsp free(refname);
2352 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2353 3e3a69f1 2019-07-25 stsp return err;
2356 3e3a69f1 2019-07-25 stsp static const struct got_error *
2357 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2359 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2361 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2362 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2363 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2364 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2366 9d31a1d8 2018-03-11 stsp return err;
2370 ebf99748 2019-05-09 stsp static const struct got_error *
2371 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2372 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2374 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2375 ebf99748 2019-05-09 stsp FILE *index = NULL;
2377 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2378 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2379 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2380 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2382 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2384 ebf99748 2019-05-09 stsp goto done;
2386 c56c5d8a 2021-12-31 thomas index = fopen(*fileindex_path, "rbe");
2387 ebf99748 2019-05-09 stsp if (index == NULL) {
2388 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2389 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2391 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2392 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2393 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2396 ebf99748 2019-05-09 stsp if (err) {
2397 ebf99748 2019-05-09 stsp free(*fileindex_path);
2398 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2399 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2400 ebf99748 2019-05-09 stsp *fileindex = NULL;
2402 ebf99748 2019-05-09 stsp return err;
2405 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2406 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2407 c932eeeb 2019-05-22 stsp const char *path;
2408 c932eeeb 2019-05-22 stsp size_t path_len;
2409 c932eeeb 2019-05-22 stsp const char *entry_name;
2410 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2411 a484d721 2019-06-10 stsp void *progress_arg;
2414 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2415 c932eeeb 2019-05-22 stsp static const struct got_error *
2416 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2418 1ee397ad 2019-07-12 stsp const struct got_error *err;
2419 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2421 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2422 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2423 c932eeeb 2019-05-22 stsp return NULL;
2424 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2425 102ff934 2019-06-11 stsp return NULL;
2427 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2428 a769b60b 2021-06-27 stsp return NULL;
2430 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2431 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2432 c932eeeb 2019-05-22 stsp return NULL;
2434 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2435 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2436 edd02c5e 2019-07-11 stsp ie->path);
2438 1ee397ad 2019-07-12 stsp return err;
2440 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2441 c932eeeb 2019-05-22 stsp return NULL;
2444 a615e0e7 2020-12-16 stsp static const struct got_error *
2445 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2446 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2447 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2449 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2451 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2452 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2453 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2454 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2455 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2456 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2458 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2459 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2462 9c6338c4 2019-06-02 stsp static const struct got_error *
2463 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2465 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2466 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2467 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2468 867630bb 2020-01-17 stsp struct timespec timeout;
2470 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2471 fc2a50f2 2022-11-01 thomas fileindex_path, "");
2473 9c6338c4 2019-06-02 stsp goto done;
2475 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2477 9c6338c4 2019-06-02 stsp goto done;
2479 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2480 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2481 9c6338c4 2019-06-02 stsp fileindex_path);
2482 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2486 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2487 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2488 867630bb 2020-01-17 stsp * was recorded in the file index.
2490 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2491 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2492 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2494 9c6338c4 2019-06-02 stsp if (new_index)
2495 9c6338c4 2019-06-02 stsp fclose(new_index);
2496 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2497 9c6338c4 2019-06-02 stsp return err;
2500 6ced4176 2019-07-12 stsp static const struct got_error *
2501 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2502 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2503 945f9229 2022-04-16 thomas struct got_commit_object *base_commit, struct got_worktree *worktree,
2504 945f9229 2022-04-16 thomas struct got_repository *repo)
2506 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2507 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2508 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2509 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2511 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2512 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2513 6ced4176 2019-07-12 stsp *tree_id = NULL;
2515 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2516 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2517 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2518 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2519 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2520 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2521 6ced4176 2019-07-12 stsp goto done;
2523 945f9229 2022-04-16 thomas err = got_object_id_by_path(tree_id, repo, base_commit,
2524 945f9229 2022-04-16 thomas worktree->path_prefix);
2526 6ced4176 2019-07-12 stsp goto done;
2527 6ced4176 2019-07-12 stsp return NULL;
2530 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2532 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2533 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2534 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2535 6ced4176 2019-07-12 stsp goto done;
2538 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2540 6ced4176 2019-07-12 stsp goto done;
2542 6ced4176 2019-07-12 stsp free(in_repo_path);
2543 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2545 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2547 6ced4176 2019-07-12 stsp goto done;
2549 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2550 6ced4176 2019-07-12 stsp /* Check out a single file. */
2551 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2552 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2553 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2554 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2555 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2556 6ced4176 2019-07-12 stsp goto done;
2558 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2559 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2560 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2561 6ced4176 2019-07-12 stsp goto done;
2564 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2565 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2567 6ced4176 2019-07-12 stsp return err;
2568 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2569 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2570 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2571 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2572 6ced4176 2019-07-12 stsp goto done;
2575 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2576 945f9229 2022-04-16 thomas base_commit, in_repo_path);
2578 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2579 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2580 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2581 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2582 6ced4176 2019-07-12 stsp goto done;
2584 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2585 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2586 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2587 6ced4176 2019-07-12 stsp goto done;
2592 6ced4176 2019-07-12 stsp free(in_repo_path);
2593 6ced4176 2019-07-12 stsp if (err) {
2594 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2595 6ced4176 2019-07-12 stsp free(*tree_relpath);
2596 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2597 6ced4176 2019-07-12 stsp free(*tree_id);
2598 6ced4176 2019-07-12 stsp *tree_id = NULL;
2600 07ed472d 2019-07-12 stsp return err;
2603 07ed472d 2019-07-12 stsp static const struct got_error *
2604 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2605 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2606 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2607 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2609 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2610 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2611 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2612 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2613 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2615 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2616 7f47418f 2019-12-20 stsp if (err) {
2617 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2618 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2619 7f47418f 2019-12-20 stsp goto done;
2620 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2621 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2623 7f47418f 2019-12-20 stsp return err;
2626 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2627 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2629 07ed472d 2019-07-12 stsp goto done;
2631 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2633 07ed472d 2019-07-12 stsp goto done;
2635 07ed472d 2019-07-12 stsp if (entry_name &&
2636 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2637 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2638 07ed472d 2019-07-12 stsp goto done;
2641 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2642 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2643 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2644 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2645 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2646 07ed472d 2019-07-12 stsp arg.repo = repo;
2647 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2648 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2649 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2650 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2651 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2652 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2655 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2656 07ed472d 2019-07-12 stsp if (commit)
2657 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2658 6ced4176 2019-07-12 stsp return err;
2661 9d31a1d8 2018-03-11 stsp const struct got_error *
2662 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2663 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2664 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2665 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2667 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2668 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2669 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2670 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2671 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2672 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2673 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2674 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2675 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2676 f2ea84fa 2019-07-27 stsp int entry_type;
2677 f2ea84fa 2019-07-27 stsp char *relpath;
2678 f2ea84fa 2019-07-27 stsp char *entry_name;
2679 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2680 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2682 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2684 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2686 9d31a1d8 2018-03-11 stsp return err;
2688 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
2689 945f9229 2022-04-16 thomas worktree->base_commit_id);
2690 945f9229 2022-04-16 thomas if (err)
2691 945f9229 2022-04-16 thomas goto done;
2693 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2694 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2695 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2696 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2697 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2698 f2ea84fa 2019-07-27 stsp goto done;
2701 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2702 945f9229 2022-04-16 thomas &tpd->relpath, &tpd->tree_id, pe->path, commit,
2703 945f9229 2022-04-16 thomas worktree, repo);
2704 f2ea84fa 2019-07-27 stsp if (err) {
2705 f2ea84fa 2019-07-27 stsp free(tpd);
2706 6ced4176 2019-07-12 stsp goto done;
2709 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2710 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2711 f2ea84fa 2019-07-27 stsp if (err) {
2712 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2713 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2714 f2ea84fa 2019-07-27 stsp free(tpd);
2715 f2ea84fa 2019-07-27 stsp goto done;
2718 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2720 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2724 51514078 2018-12-25 stsp * Read the file index.
2725 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2726 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2728 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2730 c4cdcb68 2019-04-03 stsp goto done;
2732 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2733 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2734 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2736 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2737 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2738 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2742 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2743 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2744 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2745 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2746 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2747 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2748 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2749 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2753 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2755 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2756 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2757 af12c6b9 2019-06-04 stsp err = sync_err;
2759 9c6338c4 2019-06-02 stsp free(fileindex_path);
2761 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2762 9d31a1d8 2018-03-11 stsp if (commit)
2763 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2764 5ade8233 2019-07-12 stsp if (fileindex)
2765 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2766 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2767 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2768 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2769 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2770 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2771 f2ea84fa 2019-07-27 stsp free(tpd);
2773 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2774 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2775 9d31a1d8 2018-03-11 stsp err = unlockerr;
2776 f8d1f275 2019-02-04 stsp return err;
2779 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2780 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2781 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2782 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2783 234035bc 2019-06-01 stsp void *progress_arg;
2784 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2785 234035bc 2019-06-01 stsp void *cancel_arg;
2786 f69721c3 2019-10-21 stsp const char *label_orig;
2787 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2788 ace90326 2021-09-27 thomas int allow_bad_symlinks;
2791 234035bc 2019-06-01 stsp static const struct got_error *
2792 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2793 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
2794 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
2795 a0f32f33 2022-06-13 thomas const char *path1, const char *path2,
2796 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2798 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2799 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2800 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2801 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2802 234035bc 2019-06-01 stsp struct stat sb;
2803 234035bc 2019-06-01 stsp unsigned char status;
2804 234035bc 2019-06-01 stsp int local_changes_subsumed;
2805 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2806 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2808 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2809 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2810 d6c87207 2019-08-02 stsp strlen(path2));
2811 1ee397ad 2019-07-12 stsp if (ie == NULL)
2812 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2813 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2815 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2816 234035bc 2019-06-01 stsp path2) == -1)
2817 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2819 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2822 234035bc 2019-06-01 stsp goto done;
2824 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2825 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2826 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2827 234035bc 2019-06-01 stsp goto done;
2829 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2830 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2831 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2832 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2833 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2834 234035bc 2019-06-01 stsp goto done;
2837 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2838 36bf999c 2020-07-23 stsp char *link_target2;
2839 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2841 36bf999c 2020-07-23 stsp goto done;
2842 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2843 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2844 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2845 36bf999c 2020-07-23 stsp free(link_target2);
2849 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2850 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2851 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2852 1af628f4 2021-06-03 stsp goto done;
2854 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2855 1af628f4 2021-06-03 stsp f_orig, blob1);
2857 1af628f4 2021-06-03 stsp goto done;
2859 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2860 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2861 1af628f4 2021-06-03 stsp goto done;
2862 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2863 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2865 1af628f4 2021-06-03 stsp goto done;
2867 48b4f239 2021-12-31 thomas fd = open(ondisk_path,
2868 48b4f239 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2869 1af628f4 2021-06-03 stsp if (fd == -1) {
2870 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2871 1af628f4 2021-06-03 stsp ondisk_path);
2872 1af628f4 2021-06-03 stsp goto done;
2874 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2875 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2876 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2877 1af628f4 2021-06-03 stsp ondisk_path);
2878 1af628f4 2021-06-03 stsp close(fd);
2879 1af628f4 2021-06-03 stsp goto done;
2881 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2883 1af628f4 2021-06-03 stsp goto done;
2884 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2885 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2886 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2887 1af628f4 2021-06-03 stsp goto done;
2889 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2890 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2891 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2892 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2893 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2895 234035bc 2019-06-01 stsp } else if (blob1) {
2896 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2897 d6c87207 2019-08-02 stsp strlen(path1));
2898 1ee397ad 2019-07-12 stsp if (ie == NULL)
2899 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2900 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2902 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2903 2b92fad7 2019-06-02 stsp path1) == -1)
2904 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2906 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2909 2b92fad7 2019-06-02 stsp goto done;
2911 2b92fad7 2019-06-02 stsp switch (status) {
2912 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2913 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2914 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2916 1ee397ad 2019-07-12 stsp goto done;
2917 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2919 2b92fad7 2019-06-02 stsp goto done;
2921 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2923 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2924 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2925 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2926 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2928 1ee397ad 2019-07-12 stsp goto done;
2930 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2932 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2933 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2934 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2935 e8f02263 2022-01-23 thomas off_t blob1_size;
2937 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2938 0a22ca1a 2020-09-23 stsp * exists in the repository.
2940 e8f02263 2022-01-23 thomas err = got_object_blob_file_create(&id, &blob1_f,
2941 e8f02263 2022-01-23 thomas &blob1_size, path1);
2943 0a22ca1a 2020-09-23 stsp goto done;
2944 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2945 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2946 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2948 0a22ca1a 2020-09-23 stsp goto done;
2949 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2952 0a22ca1a 2020-09-23 stsp goto done;
2954 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2957 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2958 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2960 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2961 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2964 0a22ca1a 2020-09-23 stsp goto done;
2967 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2968 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2969 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2970 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2972 1ee397ad 2019-07-12 stsp goto done;
2974 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2975 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2977 1ee397ad 2019-07-12 stsp goto done;
2982 234035bc 2019-06-01 stsp } else if (blob2) {
2983 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2984 234035bc 2019-06-01 stsp path2) == -1)
2985 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2986 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2987 d6c87207 2019-08-02 stsp strlen(path2));
2989 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2990 7f91a133 2019-12-13 stsp -1, NULL, repo);
2992 234035bc 2019-06-01 stsp goto done;
2993 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2994 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2995 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2996 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2997 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2998 1ee397ad 2019-07-12 stsp status, path2);
2999 234035bc 2019-06-01 stsp goto done;
3001 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3002 36bf999c 2020-07-23 stsp char *link_target2;
3003 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3006 36bf999c 2020-07-23 stsp goto done;
3007 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3008 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3009 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3010 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3011 36bf999c 2020-07-23 stsp free(link_target2);
3012 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3013 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3014 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3015 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3016 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3017 526a746f 2020-07-23 stsp a->progress_arg);
3019 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3020 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3023 dfe9fba0 2020-07-23 stsp goto done;
3024 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3025 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3026 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3027 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3029 234035bc 2019-06-01 stsp goto done;
3032 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3033 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3034 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3035 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3036 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3037 ace90326 2021-09-27 thomas 0, 1, a->allow_bad_symlinks, repo,
3038 ace90326 2021-09-27 thomas a->progress_cb, a->progress_arg);
3040 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3041 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3042 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3045 234035bc 2019-06-01 stsp goto done;
3046 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3048 234035bc 2019-06-01 stsp goto done;
3049 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3050 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3051 3969253a 2020-03-07 stsp if (err) {
3052 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3053 3969253a 2020-03-07 stsp goto done;
3055 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3056 2b92fad7 2019-06-02 stsp if (err) {
3057 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3058 2b92fad7 2019-06-02 stsp goto done;
3060 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3061 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3062 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3067 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3068 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3069 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3070 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3071 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3072 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3073 1af628f4 2021-06-03 stsp free(id_str);
3074 54d5be07 2021-06-03 stsp free(label_deriv2);
3075 234035bc 2019-06-01 stsp free(ondisk_path);
3076 234035bc 2019-06-01 stsp return err;
3079 69de9dd4 2021-09-03 stsp static const struct got_error *
3080 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3082 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3084 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3085 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3086 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3087 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3088 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3090 69de9dd4 2021-09-03 stsp return NULL;
3093 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3094 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3095 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3096 234035bc 2019-06-01 stsp struct got_repository *repo;
3099 234035bc 2019-06-01 stsp static const struct got_error *
3100 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3101 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
3102 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
3103 a0f32f33 2022-06-13 thomas const char *path1, const char *path2,
3104 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3106 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3107 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3108 234035bc 2019-06-01 stsp unsigned char status;
3109 234035bc 2019-06-01 stsp struct stat sb;
3110 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3111 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3112 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3113 234035bc 2019-06-01 stsp char *ondisk_path;
3115 69de9dd4 2021-09-03 stsp if (id == NULL)
3116 69de9dd4 2021-09-03 stsp return NULL;
3118 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3119 69de9dd4 2021-09-03 stsp if (ie == NULL)
3120 69de9dd4 2021-09-03 stsp return NULL;
3122 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3124 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3126 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3127 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3128 5546d466 2021-09-02 stsp free(ondisk_path);
3130 234035bc 2019-06-01 stsp return err;
3131 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3132 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3134 234035bc 2019-06-01 stsp return NULL;
3137 818c7501 2019-07-11 stsp static const struct got_error *
3138 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3139 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3140 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3141 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3142 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3144 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3145 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3146 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3147 945f9229 2022-04-16 thomas struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3148 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3149 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3150 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3151 a0f32f33 2022-06-13 thomas FILE *f1 = NULL, *f2 = NULL;
3152 19a6a6b5 2022-07-01 thomas int fd1 = -1, fd2 = -1;
3154 03415a1a 2019-06-02 stsp if (commit_id1) {
3155 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit1, repo, commit_id1);
3156 945f9229 2022-04-16 thomas if (err)
3157 945f9229 2022-04-16 thomas goto done;
3158 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id1, repo, commit1,
3159 03415a1a 2019-06-02 stsp worktree->path_prefix);
3160 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3161 03415a1a 2019-06-02 stsp goto done;
3163 69d57f3d 2020-07-31 stsp if (tree_id1) {
3164 69d57f3d 2020-07-31 stsp char *id_str;
3166 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3168 03415a1a 2019-06-02 stsp goto done;
3170 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3172 f69721c3 2019-10-21 stsp goto done;
3174 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3175 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3176 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3177 f69721c3 2019-10-21 stsp free(id_str);
3178 f69721c3 2019-10-21 stsp goto done;
3180 f69721c3 2019-10-21 stsp free(id_str);
3182 a0f32f33 2022-06-13 thomas f1 = got_opentemp();
3183 a0f32f33 2022-06-13 thomas if (f1 == NULL) {
3184 a0f32f33 2022-06-13 thomas err = got_error_from_errno("got_opentemp");
3185 a0f32f33 2022-06-13 thomas goto done;
3189 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit2, repo, commit_id2);
3190 945f9229 2022-04-16 thomas if (err)
3191 945f9229 2022-04-16 thomas goto done;
3193 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id2, repo, commit2,
3194 234035bc 2019-06-01 stsp worktree->path_prefix);
3196 234035bc 2019-06-01 stsp goto done;
3198 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3200 234035bc 2019-06-01 stsp goto done;
3202 a0f32f33 2022-06-13 thomas f2 = got_opentemp();
3203 a0f32f33 2022-06-13 thomas if (f2 == NULL) {
3204 a0f32f33 2022-06-13 thomas err = got_error_from_errno("got_opentemp");
3205 19a6a6b5 2022-07-01 thomas goto done;
3208 19a6a6b5 2022-07-01 thomas fd1 = got_opentempfd();
3209 19a6a6b5 2022-07-01 thomas if (fd1 == -1) {
3210 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
3211 a0f32f33 2022-06-13 thomas goto done;
3214 19a6a6b5 2022-07-01 thomas fd2 = got_opentempfd();
3215 19a6a6b5 2022-07-01 thomas if (fd2 == -1) {
3216 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
3217 19a6a6b5 2022-07-01 thomas goto done;
3220 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3221 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3222 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3223 19a6a6b5 2022-07-01 thomas err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3224 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3226 69de9dd4 2021-09-03 stsp goto done;
3228 234035bc 2019-06-01 stsp arg.worktree = worktree;
3229 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3230 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3231 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3232 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3233 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3234 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3235 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3236 ace90326 2021-09-27 thomas arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3237 19a6a6b5 2022-07-01 thomas err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3238 a0f32f33 2022-06-13 thomas merge_file_cb, &arg, 1);
3239 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3240 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3241 af12c6b9 2019-06-04 stsp err = sync_err;
3243 945f9229 2022-04-16 thomas if (commit1)
3244 945f9229 2022-04-16 thomas got_object_commit_close(commit1);
3245 945f9229 2022-04-16 thomas if (commit2)
3246 945f9229 2022-04-16 thomas got_object_commit_close(commit2);
3247 234035bc 2019-06-01 stsp if (tree1)
3248 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3249 234035bc 2019-06-01 stsp if (tree2)
3250 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3251 a0f32f33 2022-06-13 thomas if (f1 && fclose(f1) == EOF && err == NULL)
3252 a0f32f33 2022-06-13 thomas err = got_error_from_errno("fclose");
3253 a0f32f33 2022-06-13 thomas if (f2 && fclose(f2) == EOF && err == NULL)
3254 a0f32f33 2022-06-13 thomas err = got_error_from_errno("fclose");
3255 19a6a6b5 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3256 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("close");
3257 19a6a6b5 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3258 19a6a6b5 2022-07-01 thomas err = got_error_from_errno("close");
3259 f69721c3 2019-10-21 stsp free(label_orig);
3260 818c7501 2019-07-11 stsp return err;
3263 818c7501 2019-07-11 stsp const struct got_error *
3264 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3265 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3266 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3267 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3269 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3270 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3271 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3273 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3275 818c7501 2019-07-11 stsp return err;
3277 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3279 818c7501 2019-07-11 stsp goto done;
3281 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3282 69de9dd4 2021-09-03 stsp worktree);
3284 818c7501 2019-07-11 stsp goto done;
3286 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3287 10604dce 2021-09-24 thomas commit_id2, repo, progress_cb, progress_arg,
3288 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
3290 818c7501 2019-07-11 stsp if (fileindex)
3291 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3292 818c7501 2019-07-11 stsp free(fileindex_path);
3293 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3294 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3295 234035bc 2019-06-01 stsp err = unlockerr;
3296 234035bc 2019-06-01 stsp return err;
3299 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3300 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3301 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3302 927df6b7 2019-02-10 stsp const char *status_path;
3303 927df6b7 2019-02-10 stsp size_t status_path_len;
3304 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3305 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3306 f8d1f275 2019-02-04 stsp void *status_arg;
3307 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3308 f8d1f275 2019-02-04 stsp void *cancel_arg;
3309 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3310 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3311 f2a9dc41 2019-12-13 tracey int report_unchanged;
3312 3143d852 2020-06-25 stsp int no_ignores;
3315 f8d1f275 2019-02-04 stsp static const struct got_error *
3316 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3317 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3318 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3319 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3321 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3322 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3323 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3324 927df6b7 2019-02-10 stsp struct stat sb;
3325 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3326 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3327 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3329 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3331 98eaaa12 2019-08-03 stsp return err;
3333 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3334 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3335 98eaaa12 2019-08-03 stsp return NULL;
3337 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3338 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3339 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3341 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3342 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3343 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3345 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3346 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3347 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3348 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3349 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3352 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3353 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3356 927df6b7 2019-02-10 stsp static const struct got_error *
3357 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3358 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3360 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3361 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3362 f8d1f275 2019-02-04 stsp char *abspath;
3364 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3365 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3367 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3368 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3369 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3370 927df6b7 2019-02-10 stsp return NULL;
3372 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3373 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3374 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3375 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3377 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3378 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3379 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3382 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3383 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3384 f8d1f275 2019-02-04 stsp free(abspath);
3385 9d31a1d8 2018-03-11 stsp return err;
3388 f8d1f275 2019-02-04 stsp static const struct got_error *
3389 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3391 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3392 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3393 2ec1f75b 2019-03-26 stsp unsigned char status;
3395 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3396 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3398 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3399 927df6b7 2019-02-10 stsp return NULL;
3401 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3402 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3403 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3404 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3406 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3407 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3408 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3411 ef20f542 2022-06-26 thomas static void
3412 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3414 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3416 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3417 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3419 21c2d8be 2023-01-10 thomas got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3421 21c2d8be 2023-01-10 thomas got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3424 6841da00 2019-08-08 stsp static const struct got_error *
3425 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3427 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3428 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3429 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3430 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3431 6841da00 2019-08-08 stsp size_t linesize = 0;
3432 6841da00 2019-08-08 stsp ssize_t linelen;
3434 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3435 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3436 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3437 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3439 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3440 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3441 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3443 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3444 bd8de430 2019-10-04 stsp if (line[0] == '#')
3447 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3448 bd8de430 2019-10-04 stsp if (line[0] == '!')
3451 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3452 6841da00 2019-08-08 stsp line) == -1) {
3453 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3454 6841da00 2019-08-08 stsp goto done;
3456 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3458 6841da00 2019-08-08 stsp goto done;
3460 6841da00 2019-08-08 stsp if (ferror(f)) {
3461 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3462 6841da00 2019-08-08 stsp goto done;
3465 6841da00 2019-08-08 stsp dirpath = strdup(path);
3466 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3467 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3468 6841da00 2019-08-08 stsp goto done;
3470 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3472 6841da00 2019-08-08 stsp free(line);
3473 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3474 6841da00 2019-08-08 stsp free(dirpath);
3475 21c2d8be 2023-01-10 thomas got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3477 6841da00 2019-08-08 stsp return err;
3480 ef20f542 2022-06-26 thomas static int
3481 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3483 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3485 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3486 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3487 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3488 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3490 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3491 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3493 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3495 bd8de430 2019-10-04 stsp pattern += 3;
3497 bd8de430 2019-10-04 stsp while (*p) {
3498 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3499 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3500 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3501 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3503 bd8de430 2019-10-04 stsp while (*p == '/')
3513 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3514 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3515 6841da00 2019-08-08 stsp * ignores backwards.
3517 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3518 6841da00 2019-08-08 stsp while (pe) {
3519 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3520 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3521 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3522 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3523 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3524 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3525 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3526 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3527 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3532 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3538 6841da00 2019-08-08 stsp static const struct got_error *
3539 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3540 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3542 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3543 6841da00 2019-08-08 stsp char *ignorespath;
3544 886cec17 2019-12-15 stsp int fd = -1;
3545 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3547 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3548 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3549 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3551 886cec17 2019-12-15 stsp if (dirfd != -1) {
3552 fc63f50d 2021-12-31 thomas fd = openat(dirfd, ignores_filename,
3553 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3554 886cec17 2019-12-15 stsp if (fd == -1) {
3555 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3556 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3557 886cec17 2019-12-15 stsp ignorespath);
3559 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3560 b6b86fd1 2022-08-30 thomas if (ignoresfile == NULL)
3561 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3562 886cec17 2019-12-15 stsp ignorespath);
3565 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3569 c56c5d8a 2021-12-31 thomas ignoresfile = fopen(ignorespath, "re");
3570 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3571 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3572 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3573 886cec17 2019-12-15 stsp ignorespath);
3575 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3578 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3579 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3580 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3581 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3582 6841da00 2019-08-08 stsp free(ignorespath);
3583 6841da00 2019-08-08 stsp return err;
3586 f8d1f275 2019-02-04 stsp static const struct got_error *
3587 6092c299 2021-10-04 thomas status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3588 6092c299 2021-10-04 thomas int dirfd)
3590 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3591 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3592 f8d1f275 2019-02-04 stsp char *path = NULL;
3594 6092c299 2021-10-04 thomas if (ignore != NULL)
3595 6092c299 2021-10-04 thomas *ignore = 0;
3597 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3598 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3600 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3601 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3602 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3604 f8d1f275 2019-02-04 stsp path = de->d_name;
3607 6092c299 2021-10-04 thomas if (de->d_type == DT_DIR) {
3608 6092c299 2021-10-04 thomas if (!a->no_ignores && ignore != NULL &&
3609 6092c299 2021-10-04 thomas match_ignores(a->ignores, path))
3610 6092c299 2021-10-04 thomas *ignore = 1;
3611 6092c299 2021-10-04 thomas } else if (!match_ignores(a->ignores, path) &&
3612 6092c299 2021-10-04 thomas got_path_is_child(path, a->status_path, a->status_path_len))
3613 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3614 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3615 f8d1f275 2019-02-04 stsp if (parent_path[0])
3616 f8d1f275 2019-02-04 stsp free(path);
3617 b72f483a 2019-02-05 stsp return err;
3620 347d1d3e 2019-07-12 stsp static const struct got_error *
3621 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3623 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3624 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3626 3143d852 2020-06-25 stsp if (a->no_ignores)
3627 3143d852 2020-06-25 stsp return NULL;
3629 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3630 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3632 3143d852 2020-06-25 stsp return err;
3634 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3635 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3637 3143d852 2020-06-25 stsp return err;
3640 3143d852 2020-06-25 stsp static const struct got_error *
3641 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3642 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3643 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3644 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3646 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3647 abb4604f 2019-07-27 stsp struct stat sb;
3649 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3651 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3652 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3654 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3655 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3656 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3657 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3658 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3661 fe1d8685 2022-02-12 thomas if (!no_ignores && match_ignores(ignores, path))
3662 fe1d8685 2022-02-12 thomas return NULL;
3664 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3665 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3666 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3668 abb4604f 2019-07-27 stsp return NULL;
3671 3143d852 2020-06-25 stsp static const struct got_error *
3672 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3673 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3675 3143d852 2020-06-25 stsp const struct got_error *err;
3676 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3678 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3679 3143d852 2020-06-25 stsp ".cvsignore");
3681 3143d852 2020-06-25 stsp return err;
3683 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3684 3143d852 2020-06-25 stsp ".gitignore");
3686 3143d852 2020-06-25 stsp return err;
3688 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3689 3143d852 2020-06-25 stsp if (err) {
3690 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3691 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3692 3143d852 2020-06-25 stsp return err;
3694 3143d852 2020-06-25 stsp for (;;) {
3695 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3696 3143d852 2020-06-25 stsp ".cvsignore");
3699 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3700 3143d852 2020-06-25 stsp ".gitignore");
3703 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3704 3143d852 2020-06-25 stsp if (err) {
3705 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3706 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3709 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3711 b737c85a 2020-06-26 stsp free(parent_path);
3712 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3713 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3716 b737c85a 2020-06-26 stsp free(parent_path);
3717 b737c85a 2020-06-26 stsp free(next_parent_path);
3718 3143d852 2020-06-25 stsp return err;
3721 abb4604f 2019-07-27 stsp static const struct got_error *
3722 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3723 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3724 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3725 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3726 f2a9dc41 2019-12-13 tracey int report_unchanged)
3728 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3729 6fc93f37 2019-12-13 stsp int fd = -1;
3730 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3731 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3732 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3733 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3734 a78810f8 2022-03-13 thomas struct got_fileindex_entry *ie;
3736 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3738 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3739 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3740 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3742 a78810f8 2022-03-13 thomas ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3743 a78810f8 2022-03-13 thomas if (ie) {
3744 a78810f8 2022-03-13 thomas err = report_single_file_status(path, ondisk_path,
3745 a78810f8 2022-03-13 thomas fileindex, status_cb, status_arg, repo,
3746 a78810f8 2022-03-13 thomas report_unchanged, &ignores, no_ignores);
3747 a78810f8 2022-03-13 thomas goto done;
3750 06340621 2021-12-31 thomas fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3751 6fc93f37 2019-12-13 stsp if (fd == -1) {
3752 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3753 3dc1dc04 2021-09-27 thomas !got_err_open_nofollow_on_symlink())
3754 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3756 ff56836b 2021-07-08 stsp if (!no_ignores) {
3757 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3758 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3760 ff56836b 2021-07-08 stsp goto done;
3762 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3763 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3764 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3767 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3768 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3769 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3770 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3771 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3772 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3773 abb4604f 2019-07-27 stsp arg.status_path = path;
3774 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3775 abb4604f 2019-07-27 stsp arg.repo = repo;
3776 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3777 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3778 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3779 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3780 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3781 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3782 022fae89 2019-12-06 tracey if (!no_ignores) {
3783 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3784 3143d852 2020-06-25 stsp worktree->root_path, path);
3786 3143d852 2020-06-25 stsp goto done;
3788 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3789 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3790 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3793 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3794 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3795 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3796 927df6b7 2019-02-10 stsp free(ondisk_path);
3797 347d1d3e 2019-07-12 stsp return err;
3800 347d1d3e 2019-07-12 stsp const struct got_error *
3801 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3802 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3803 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3804 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3806 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3807 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3808 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3809 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3811 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3813 347d1d3e 2019-07-12 stsp return err;
3815 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3816 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3817 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3818 f6343036 2021-06-22 stsp no_ignores, 0);
3822 f8d1f275 2019-02-04 stsp free(fileindex_path);
3823 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3824 f8d1f275 2019-02-04 stsp return err;
3827 6c7ab921 2019-03-18 stsp const struct got_error *
3828 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3829 6c7ab921 2019-03-18 stsp const char *arg)
3831 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3832 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3833 6c7ab921 2019-03-18 stsp size_t len;
3834 00bb5ea0 2020-07-23 stsp struct stat sb;
3835 01740607 2020-11-04 stsp char *abspath = NULL;
3836 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3838 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3840 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3841 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3842 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3844 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3845 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3846 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3847 00bb5ea0 2020-07-23 stsp goto done;
3849 727173c3 2020-11-06 stsp sb.st_mode = 0;
3851 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3853 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3854 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3855 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3856 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3858 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3859 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3860 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3861 00bb5ea0 2020-07-23 stsp goto done;
3865 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3866 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3868 d0710d08 2019-07-22 stsp goto done;
3869 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3870 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3871 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3872 00bb5ea0 2020-07-23 stsp goto done;
3875 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3876 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3877 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3878 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3879 00bb5ea0 2020-07-23 stsp goto done;
3881 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3882 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3883 01740607 2020-11-04 stsp goto done;
3885 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3886 01740607 2020-11-04 stsp sizeof(canonpath));
3888 00bb5ea0 2020-07-23 stsp goto done;
3889 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3890 01740607 2020-11-04 stsp if (resolved == NULL) {
3891 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3892 01740607 2020-11-04 stsp goto done;
3897 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3898 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3899 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3900 6c7ab921 2019-03-18 stsp goto done;
3903 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3904 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3905 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3907 f6d88e1a 2019-05-29 stsp goto done;
3909 f6d88e1a 2019-05-29 stsp path = strdup("");
3910 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3911 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3912 f6d88e1a 2019-05-29 stsp goto done;
3916 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3917 6c7ab921 2019-03-18 stsp len = strlen(path);
3918 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3919 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3923 01740607 2020-11-04 stsp free(abspath);
3924 6c7ab921 2019-03-18 stsp free(resolved);
3925 d0710d08 2019-07-22 stsp free(cwd);
3926 6c7ab921 2019-03-18 stsp if (err == NULL)
3927 6c7ab921 2019-03-18 stsp *wt_path = path;
3929 6c7ab921 2019-03-18 stsp free(path);
3930 d00136be 2019-03-26 stsp return err;
3933 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3934 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3935 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3936 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3937 4e68cba3 2019-11-23 stsp void *progress_arg;
3938 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3941 4e68cba3 2019-11-23 stsp static const struct got_error *
3942 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3943 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3944 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3945 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3947 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3948 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3949 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3950 6d022e97 2019-08-04 stsp struct stat sb;
3951 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3953 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3954 dbb83fbd 2019-12-12 stsp relpath) == -1)
3955 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3957 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3959 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3960 12463d8b 2019-12-13 stsp de_name, a->repo);
3962 dbb83fbd 2019-12-12 stsp goto done;
3963 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3964 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3965 dbb83fbd 2019-12-12 stsp goto done;
3966 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3968 dbb83fbd 2019-12-12 stsp goto done;
3971 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3972 84bf00a6 2022-02-12 thomas if (status == GOT_STATUS_NONEXISTENT)
3973 84bf00a6 2022-02-12 thomas err = got_error_set_errno(ENOENT, ondisk_path);
3975 84bf00a6 2022-02-12 thomas err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3976 dbb83fbd 2019-12-12 stsp goto done;
3979 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3981 4e68cba3 2019-11-23 stsp goto done;
3982 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3983 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3984 3969253a 2020-03-07 stsp if (err) {
3985 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3986 3969253a 2020-03-07 stsp goto done;
3988 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3989 07f5b47a 2019-06-02 stsp if (err) {
3990 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3991 4e68cba3 2019-11-23 stsp goto done;
3994 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3996 dbb83fbd 2019-12-12 stsp return err;
3997 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3998 dbb83fbd 2019-12-12 stsp return NULL;
3999 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4002 d00136be 2019-03-26 stsp const struct got_error *
4003 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4004 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4005 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4006 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4008 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4009 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4010 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4011 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4012 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4014 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4016 d00136be 2019-03-26 stsp return err;
4018 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4020 d00136be 2019-03-26 stsp goto done;
4022 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4023 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4024 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4025 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4026 4e68cba3 2019-11-23 stsp saa.repo = repo;
4028 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4029 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4030 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4034 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4035 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4036 af12c6b9 2019-06-04 stsp err = sync_err;
4038 fb399478 2019-07-12 stsp free(fileindex_path);
4039 d00136be 2019-03-26 stsp if (fileindex)
4040 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4041 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4042 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4043 d00136be 2019-03-26 stsp err = unlockerr;
4044 6c7ab921 2019-03-18 stsp return err;
4047 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4048 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4049 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4050 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4051 f2a9dc41 2019-12-13 tracey void *progress_arg;
4052 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4053 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4054 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4055 d64cc78a 2022-01-25 thomas int ignore_missing_paths;
4056 766841c2 2020-08-13 stsp const char *status_codes;
4059 f2a9dc41 2019-12-13 tracey static const struct got_error *
4060 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4061 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4062 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4063 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4065 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4066 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4067 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4068 17ed4618 2019-06-02 stsp struct stat sb;
4069 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4071 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_NONEXISTENT) {
4072 d64cc78a 2022-01-25 thomas if (a->ignore_missing_paths)
4073 d64cc78a 2022-01-25 thomas return NULL;
4074 d64cc78a 2022-01-25 thomas return got_error_set_errno(ENOENT, relpath);
4077 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4078 17ed4618 2019-06-02 stsp if (ie == NULL)
4079 d5a18ace 2022-01-25 thomas return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4081 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4082 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4083 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4084 9acbc4fa 2019-08-03 stsp return NULL;
4085 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4088 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4089 f2a9dc41 2019-12-13 tracey relpath) == -1)
4090 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4092 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4095 f2a9dc41 2019-12-13 tracey goto done;
4097 766841c2 2020-08-13 stsp if (a->status_codes) {
4098 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4100 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4101 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4104 b6b86fd1 2022-08-30 thomas if (i == ncodes) {
4105 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4106 766841c2 2020-08-13 stsp free(ondisk_path);
4107 766841c2 2020-08-13 stsp return NULL;
4109 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4110 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4111 766841c2 2020-08-13 stsp static char msg[64];
4112 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4113 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4114 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4115 766841c2 2020-08-13 stsp goto done;
4119 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4120 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4121 f2a9dc41 2019-12-13 tracey goto done;
4122 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4123 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4124 f2a9dc41 2019-12-13 tracey goto done;
4126 d64cc78a 2022-01-25 thomas if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4127 d64cc78a 2022-01-25 thomas err = got_error_set_errno(ENOENT, relpath);
4128 d64cc78a 2022-01-25 thomas goto done;
4130 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4131 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4132 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4133 f2a9dc41 2019-12-13 tracey goto done;
4137 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4138 20a2ad1c 2020-10-20 stsp size_t root_len;
4140 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4141 e6b88e16 2022-10-16 thomas if (unlinkat(dirfd, de_name, 0) == -1) {
4142 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4143 12463d8b 2019-12-13 stsp ondisk_path);
4144 12463d8b 2019-12-13 stsp goto done;
4146 e6b88e16 2022-10-16 thomas } else if (unlink(ondisk_path) == -1) {
4147 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4148 12463d8b 2019-12-13 stsp goto done;
4151 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4153 20a2ad1c 2020-10-20 stsp char *parent;
4154 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4156 2513f20a 2020-10-20 stsp goto done;
4157 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4158 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4159 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4160 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4161 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4162 20a2ad1c 2020-10-20 stsp ondisk_path);
4165 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4166 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4169 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4171 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4172 f2a9dc41 2019-12-13 tracey if (err)
4173 f2a9dc41 2019-12-13 tracey return err;
4174 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4175 f2a9dc41 2019-12-13 tracey return NULL;
4176 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4177 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4180 2ec1f75b 2019-03-26 stsp const struct got_error *
4181 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4182 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4183 766841c2 2020-08-13 stsp const char *status_codes,
4184 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4185 d64cc78a 2022-01-25 thomas struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4187 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4188 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4189 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4190 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4191 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4193 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4195 2ec1f75b 2019-03-26 stsp return err;
4197 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4199 2ec1f75b 2019-03-26 stsp goto done;
4201 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4202 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4203 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4204 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4205 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4206 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4207 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4208 d64cc78a 2022-01-25 thomas sda.ignore_missing_paths = ignore_missing_paths;
4209 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4211 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4212 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4213 6092c299 2021-10-04 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4217 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4218 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4219 af12c6b9 2019-06-04 stsp err = sync_err;
4221 fb399478 2019-07-12 stsp free(fileindex_path);
4222 2ec1f75b 2019-03-26 stsp if (fileindex)
4223 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4224 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4225 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4226 2ec1f75b 2019-03-26 stsp err = unlockerr;
4227 33aa809d 2019-08-08 stsp return err;
4230 33aa809d 2019-08-08 stsp static const struct got_error *
4231 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4233 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4234 33aa809d 2019-08-08 stsp char *line = NULL;
4235 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4236 33aa809d 2019-08-08 stsp ssize_t linelen;
4238 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4239 33aa809d 2019-08-08 stsp if (linelen == -1) {
4240 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4241 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4242 33aa809d 2019-08-08 stsp goto done;
4244 33aa809d 2019-08-08 stsp return NULL;
4246 33aa809d 2019-08-08 stsp if (outfile) {
4247 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4248 33aa809d 2019-08-08 stsp if (n != linelen) {
4249 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4250 33aa809d 2019-08-08 stsp goto done;
4253 33aa809d 2019-08-08 stsp if (rejectfile) {
4254 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4255 33aa809d 2019-08-08 stsp if (n != linelen)
4256 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4259 33aa809d 2019-08-08 stsp free(line);
4260 2ec1f75b 2019-03-26 stsp return err;
4263 33aa809d 2019-08-08 stsp static const struct got_error *
4264 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4266 33aa809d 2019-08-08 stsp char *line = NULL;
4267 33aa809d 2019-08-08 stsp size_t linesize = 0;
4268 33aa809d 2019-08-08 stsp ssize_t linelen;
4270 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4271 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4272 500467ff 2019-09-25 hiltjo if (ferror(f))
4273 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4274 500467ff 2019-09-25 hiltjo return NULL;
4276 33aa809d 2019-08-08 stsp free(line);
4277 33aa809d 2019-08-08 stsp return NULL;
4280 33aa809d 2019-08-08 stsp static const struct got_error *
4281 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4282 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4283 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4285 33aa809d 2019-08-08 stsp const struct got_error *err;
4287 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4288 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4289 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4291 33aa809d 2019-08-08 stsp return err;
4292 33aa809d 2019-08-08 stsp (*line_cur1)++;
4294 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4295 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4296 33aa809d 2019-08-08 stsp if (rejectfile)
4297 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4299 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4301 33aa809d 2019-08-08 stsp return err;
4302 33aa809d 2019-08-08 stsp (*line_cur2)++;
4304 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4305 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4306 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4308 33aa809d 2019-08-08 stsp return err;
4309 33aa809d 2019-08-08 stsp (*line_cur2)++;
4311 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4312 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4313 33aa809d 2019-08-08 stsp if (rejectfile)
4314 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4316 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4318 33aa809d 2019-08-08 stsp return err;
4319 33aa809d 2019-08-08 stsp (*line_cur1)++;
4322 f1e81a05 2019-08-10 stsp return NULL;
4325 f1e81a05 2019-08-10 stsp static const struct got_error *
4326 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4327 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4329 f1e81a05 2019-08-10 stsp const struct got_error *err;
4331 f1e81a05 2019-08-10 stsp if (outfile) {
4332 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4333 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4334 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4336 f1e81a05 2019-08-10 stsp return err;
4337 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4340 f1e81a05 2019-08-10 stsp if (rejectfile) {
4341 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4342 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4343 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4345 f1e81a05 2019-08-10 stsp return err;
4346 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4350 33aa809d 2019-08-08 stsp return NULL;
4353 33aa809d 2019-08-08 stsp static const struct got_error *
4354 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4355 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4356 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4357 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4358 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4360 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4361 b6b86fd1 2022-08-30 thomas struct diff_chunk_context cc = {};
4362 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4363 33aa809d 2019-08-08 stsp FILE *hunkfile;
4364 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4365 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4368 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4370 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4371 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4372 fe621944 2020-11-10 stsp start_old = cc.left.start;
4373 fe621944 2020-11-10 stsp end_old = cc.left.end;
4374 fe621944 2020-11-10 stsp start_new = cc.right.start;
4375 fe621944 2020-11-10 stsp end_new = cc.right.end;
4377 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4378 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4379 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4381 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4382 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4383 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4385 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4386 fe621944 2020-11-10 stsp if (diff_state == NULL)
4387 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4388 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4390 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4391 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4392 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4393 33aa809d 2019-08-08 stsp goto done;
4396 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4397 fe621944 2020-11-10 stsp diff_result, &cc);
4398 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4399 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4400 33aa809d 2019-08-08 stsp goto done;
4403 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4404 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4405 33aa809d 2019-08-08 stsp goto done;
4408 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4409 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4411 33aa809d 2019-08-08 stsp goto done;
4413 33aa809d 2019-08-08 stsp switch (*choice) {
4414 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4415 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4416 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4418 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
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, rejectfile, outfile);
4422 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4425 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4429 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4430 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4431 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4432 33aa809d 2019-08-08 stsp return err;
4435 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4436 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4437 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4438 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4439 1f1abb7e 2019-08-08 stsp void *progress_arg;
4440 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4441 33aa809d 2019-08-08 stsp void *patch_arg;
4442 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4443 10604dce 2021-09-24 thomas int unlink_added_files;
4446 e20a8b6f 2019-06-04 stsp static const struct got_error *
4447 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4448 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4449 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4450 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4451 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4453 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4454 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4455 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4456 f4ae6ddb 2022-07-01 thomas int fd = -1, fd2 = -1;
4457 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4458 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4459 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4460 fe621944 2020-11-10 stsp struct stat sb2;
4461 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4462 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4463 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4465 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4467 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4469 33aa809d 2019-08-08 stsp return err;
4471 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4472 fc63f50d 2021-12-31 thomas fd2 = openat(dirfd2, de_name2,
4473 fc63f50d 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4474 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4475 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4476 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4477 fa3cef63 2020-07-23 stsp goto done;
4479 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4480 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4481 48b4f239 2021-12-31 thomas if (link_len == -1) {
4482 48b4f239 2021-12-31 thomas return got_error_from_errno2("readlinkat",
4485 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4486 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4489 06340621 2021-12-31 thomas fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4490 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4491 3dc1dc04 2021-09-27 thomas if (!got_err_open_nofollow_on_symlink()) {
4492 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4493 fa3cef63 2020-07-23 stsp goto done;
4495 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4496 fa3cef63 2020-07-23 stsp sizeof(link_target));
4497 fa3cef63 2020-07-23 stsp if (link_len == -1)
4498 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4499 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4500 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4503 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4504 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4505 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4506 fa3cef63 2020-07-23 stsp goto done;
4509 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4510 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4511 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4512 fa3cef63 2020-07-23 stsp goto done;
4517 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4518 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4519 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4520 fa3cef63 2020-07-23 stsp goto done;
4522 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4523 fa3cef63 2020-07-23 stsp if (n != link_len) {
4524 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4525 fa3cef63 2020-07-23 stsp goto done;
4527 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4528 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4529 fa3cef63 2020-07-23 stsp goto done;
4531 fa3cef63 2020-07-23 stsp rewind(f2);
4534 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
4535 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
4536 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
4537 f4ae6ddb 2022-07-01 thomas goto done;
4540 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4542 33aa809d 2019-08-08 stsp goto done;
4544 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4546 33aa809d 2019-08-08 stsp goto done;
4548 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4550 33aa809d 2019-08-08 stsp goto done;
4552 dd2e2f52 2022-07-01 thomas err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4553 25ec7006 2022-07-01 thomas 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4555 33aa809d 2019-08-08 stsp goto done;
4557 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4560 33aa809d 2019-08-08 stsp goto done;
4562 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4563 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4564 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4565 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4567 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4568 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4569 b6b86fd1 2022-08-30 thomas struct diff_chunk_context cc = {};
4570 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4571 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4572 fe621944 2020-11-10 stsp nchanges++;
4574 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4575 33aa809d 2019-08-08 stsp int choice;
4576 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4577 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4578 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4579 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4580 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4581 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4583 33aa809d 2019-08-08 stsp goto done;
4584 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4585 33aa809d 2019-08-08 stsp have_content = 1;
4586 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4589 1ebedb77 2019-10-19 stsp if (have_content) {
4590 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4591 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4592 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4594 1ebedb77 2019-10-19 stsp goto done;
4596 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4597 a2c162eb 2022-10-30 thomas mode_t mode;
4599 a2c162eb 2022-10-30 thomas mode = apply_umask(sb2.st_mode);
4600 a2c162eb 2022-10-30 thomas if (fchmod(fileno(outfile), mode) == -1) {
4601 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4602 fa3cef63 2020-07-23 stsp goto done;
4607 33aa809d 2019-08-08 stsp free(id_str);
4608 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
4609 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
4611 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4612 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4613 fe621944 2020-11-10 stsp if (err == NULL)
4614 fe621944 2020-11-10 stsp err = free_err;
4615 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4616 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4617 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4618 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4619 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4620 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4621 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4622 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4623 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4624 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4625 33aa809d 2019-08-08 stsp if (err || !have_content) {
4626 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4627 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4628 33aa809d 2019-08-08 stsp free(*path_outfile);
4629 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4631 33aa809d 2019-08-08 stsp free(path1);
4632 33aa809d 2019-08-08 stsp return err;
4635 33aa809d 2019-08-08 stsp static const struct got_error *
4636 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4637 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4638 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4639 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4641 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4642 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4643 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4644 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4645 945f9229 2022-04-16 thomas struct got_commit_object *base_commit = NULL;
4646 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4647 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4648 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4649 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4650 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4651 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4652 f4ae6ddb 2022-07-01 thomas int fd = -1;
4654 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4655 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4656 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4657 d3bcc3d1 2019-08-08 stsp return NULL;
4659 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4660 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4661 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4663 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4664 65084dad 2019-08-08 stsp if (ie == NULL)
4665 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4667 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4668 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4669 a129376b 2019-03-28 stsp if (err) {
4670 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4671 a129376b 2019-03-28 stsp goto done;
4672 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4673 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4674 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4675 e20a8b6f 2019-06-04 stsp goto done;
4678 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4679 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4680 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4681 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4682 a129376b 2019-03-28 stsp goto done;
4685 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4686 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4687 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4688 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4689 a129376b 2019-03-28 stsp goto done;
4692 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4693 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4694 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4695 a129376b 2019-03-28 stsp goto done;
4700 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&base_commit, a->repo,
4701 945f9229 2022-04-16 thomas a->worktree->base_commit_id);
4702 945f9229 2022-04-16 thomas if (err)
4703 945f9229 2022-04-16 thomas goto done;
4705 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4706 a9fa2909 2019-07-27 stsp if (err) {
4707 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4708 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4709 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4710 a9fa2909 2019-07-27 stsp goto done;
4712 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4714 a9fa2909 2019-07-27 stsp goto done;
4716 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4718 a9fa2909 2019-07-27 stsp goto done;
4720 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4721 1233e6b6 2020-10-19 stsp free(te_name);
4722 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4723 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4724 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4725 a9fa2909 2019-07-27 stsp goto done;
4729 a129376b 2019-03-28 stsp switch (status) {
4730 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4731 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4732 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4733 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4734 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4736 33aa809d 2019-08-08 stsp goto done;
4737 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4740 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4741 1f1abb7e 2019-08-08 stsp ie->path);
4743 1ee397ad 2019-07-12 stsp goto done;
4744 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4745 10604dce 2021-09-24 thomas if (a->unlink_added_files) {
4746 10604dce 2021-09-24 thomas if (asprintf(&ondisk_path, "%s/%s",
4747 10604dce 2021-09-24 thomas got_worktree_get_root_path(a->worktree),
4748 10604dce 2021-09-24 thomas relpath) == -1) {
4749 10604dce 2021-09-24 thomas err = got_error_from_errno("asprintf");
4750 10604dce 2021-09-24 thomas goto done;
4752 10604dce 2021-09-24 thomas if (unlink(ondisk_path) == -1) {
4753 10604dce 2021-09-24 thomas err = got_error_from_errno2("unlink",
4754 10604dce 2021-09-24 thomas ondisk_path);
4759 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4760 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4761 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4762 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4763 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4765 33aa809d 2019-08-08 stsp goto done;
4766 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4769 33aa809d 2019-08-08 stsp /* fall through */
4770 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4771 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4772 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4773 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4774 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4775 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4776 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4777 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4778 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4780 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4781 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4782 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
4783 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
4784 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
4785 f4ae6ddb 2022-07-01 thomas goto done;
4788 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4790 65084dad 2019-08-08 stsp goto done;
4792 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4793 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4794 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4795 a129376b 2019-03-28 stsp goto done;
4798 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4799 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4800 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4801 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4802 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4803 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4804 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4806 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4807 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4808 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4809 369fd7e5 2020-07-23 stsp path_content);
4812 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4813 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4814 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4815 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4817 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4818 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4819 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4820 369fd7e5 2020-07-23 stsp goto done;
4824 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4825 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4826 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4827 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4828 ace90326 2021-09-27 thomas blob, 0, 1, 0, 0, a->repo,
4829 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4831 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4833 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4834 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4835 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4836 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4839 a129376b 2019-03-28 stsp goto done;
4840 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4841 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4842 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4843 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4844 437adc9d 2020-12-10 yzhong blob->id.sha1,
4845 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4847 2e1fa222 2020-07-23 stsp goto done;
4849 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4850 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4851 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4860 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4861 33aa809d 2019-08-08 stsp free(path_content);
4862 e20a8b6f 2019-06-04 stsp free(parent_path);
4863 a129376b 2019-03-28 stsp free(tree_path);
4864 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
4865 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
4867 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4869 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4870 a129376b 2019-03-28 stsp free(tree_id);
4871 945f9229 2022-04-16 thomas if (base_commit)
4872 945f9229 2022-04-16 thomas got_object_commit_close(base_commit);
4873 e20a8b6f 2019-06-04 stsp return err;
4876 e20a8b6f 2019-06-04 stsp const struct got_error *
4877 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4878 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4879 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4880 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4881 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4883 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4884 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4885 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4886 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4887 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4888 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4890 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4892 e20a8b6f 2019-06-04 stsp return err;
4894 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4896 e20a8b6f 2019-06-04 stsp goto done;
4898 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4899 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4900 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4901 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4902 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4903 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4904 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4905 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
4906 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4907 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4908 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
4912 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4913 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4914 e20a8b6f 2019-06-04 stsp err = sync_err;
4916 fb399478 2019-07-12 stsp free(fileindex_path);
4917 a129376b 2019-03-28 stsp if (fileindex)
4918 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4919 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4920 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4921 a129376b 2019-03-28 stsp err = unlockerr;
4922 c4296144 2019-05-09 stsp return err;
4925 cf066bf8 2019-05-09 stsp static void
4926 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4928 24519714 2019-05-09 stsp free(ct->path);
4929 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4930 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4931 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4932 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4933 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4934 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4938 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4939 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4940 24519714 2019-05-09 stsp struct got_repository *repo;
4941 24519714 2019-05-09 stsp struct got_worktree *worktree;
4942 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4943 5f8a88c6 2019-08-03 stsp int have_staged_files;
4944 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4945 ef899790 2022-11-01 thomas int diff_header_shown;
4946 ef899790 2022-11-01 thomas FILE *diff_outfile;
4947 ef899790 2022-11-01 thomas FILE *f1;
4948 ef899790 2022-11-01 thomas FILE *f2;
4952 ef899790 2022-11-01 thomas * Create a file which contains the target path of a symlink so we can feed
4953 ef899790 2022-11-01 thomas * it as content to the diff engine.
4955 ef899790 2022-11-01 thomas static const struct got_error *
4956 ef899790 2022-11-01 thomas get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4957 ef899790 2022-11-01 thomas const char *abspath)
4959 ef899790 2022-11-01 thomas const struct got_error *err = NULL;
4960 ef899790 2022-11-01 thomas char target_path[PATH_MAX];
4961 ef899790 2022-11-01 thomas ssize_t target_len, outlen;
4963 ef899790 2022-11-01 thomas *fd = -1;
4965 ef899790 2022-11-01 thomas if (dirfd != -1) {
4966 ef899790 2022-11-01 thomas target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4967 ef899790 2022-11-01 thomas if (target_len == -1)
4968 ef899790 2022-11-01 thomas return got_error_from_errno2("readlinkat", abspath);
4969 ef899790 2022-11-01 thomas } else {
4970 ef899790 2022-11-01 thomas target_len = readlink(abspath, target_path, PATH_MAX);
4971 ef899790 2022-11-01 thomas if (target_len == -1)
4972 ef899790 2022-11-01 thomas return got_error_from_errno2("readlink", abspath);
4975 ef899790 2022-11-01 thomas *fd = got_opentempfd();
4976 ef899790 2022-11-01 thomas if (*fd == -1)
4977 ef899790 2022-11-01 thomas return got_error_from_errno("got_opentempfd");
4979 ef899790 2022-11-01 thomas outlen = write(*fd, target_path, target_len);
4980 ef899790 2022-11-01 thomas if (outlen == -1) {
4981 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
4982 ef899790 2022-11-01 thomas goto done;
4985 ef899790 2022-11-01 thomas if (lseek(*fd, 0, SEEK_SET) == -1) {
4986 ef899790 2022-11-01 thomas err = got_error_from_errno2("lseek", abspath);
4987 ef899790 2022-11-01 thomas goto done;
4990 ef899790 2022-11-01 thomas if (err) {
4991 ef899790 2022-11-01 thomas close(*fd);
4992 ef899790 2022-11-01 thomas *fd = -1;
4994 ef899790 2022-11-01 thomas return err;
4997 ef899790 2022-11-01 thomas static const struct got_error *
4998 ef899790 2022-11-01 thomas append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
4999 ef899790 2022-11-01 thomas FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5000 b5bedbbb 2022-11-01 thomas int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5002 ef899790 2022-11-01 thomas const struct got_error *err = NULL;
5003 ef899790 2022-11-01 thomas struct got_blob_object *blob1 = NULL;
5004 ef899790 2022-11-01 thomas int fd = -1, fd1 = -1, fd2 = -1;
5005 ef899790 2022-11-01 thomas FILE *ondisk_file = NULL;
5006 ef899790 2022-11-01 thomas char *label1 = NULL;
5007 ef899790 2022-11-01 thomas struct stat sb;
5008 ef899790 2022-11-01 thomas off_t size1 = 0;
5009 ef899790 2022-11-01 thomas int f2_exists = 0;
5010 ef899790 2022-11-01 thomas char *id_str = NULL;
5012 ef899790 2022-11-01 thomas memset(&sb, 0, sizeof(sb));
5014 d259e491 2022-11-01 thomas if (diff_staged) {
5015 d259e491 2022-11-01 thomas if (ct->staged_status != GOT_STATUS_MODIFY &&
5016 d259e491 2022-11-01 thomas ct->staged_status != GOT_STATUS_ADD &&
5017 d259e491 2022-11-01 thomas ct->staged_status != GOT_STATUS_DELETE)
5018 d259e491 2022-11-01 thomas return NULL;
5019 d259e491 2022-11-01 thomas } else {
5020 d259e491 2022-11-01 thomas if (ct->status != GOT_STATUS_MODIFY &&
5021 d259e491 2022-11-01 thomas ct->status != GOT_STATUS_ADD &&
5022 d259e491 2022-11-01 thomas ct->status != GOT_STATUS_DELETE)
5023 d259e491 2022-11-01 thomas return NULL;
5026 ef899790 2022-11-01 thomas err = got_opentemp_truncate(f1);
5027 ef899790 2022-11-01 thomas if (err)
5028 ef899790 2022-11-01 thomas return got_error_from_errno("got_opentemp_truncate");
5029 ef899790 2022-11-01 thomas err = got_opentemp_truncate(f2);
5030 ef899790 2022-11-01 thomas if (err)
5031 ef899790 2022-11-01 thomas return got_error_from_errno("got_opentemp_truncate");
5033 ef899790 2022-11-01 thomas if (!*diff_header_shown) {
5034 ef899790 2022-11-01 thomas err = got_object_id_str(&id_str, worktree->base_commit_id);
5035 ef899790 2022-11-01 thomas if (err)
5036 ef899790 2022-11-01 thomas return err;
5037 ef899790 2022-11-01 thomas fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5038 ef899790 2022-11-01 thomas got_worktree_get_root_path(worktree));
5039 ef899790 2022-11-01 thomas fprintf(diff_outfile, "commit - %s\n", id_str);
5040 ef899790 2022-11-01 thomas fprintf(diff_outfile, "path + %s%s\n",
5041 ef899790 2022-11-01 thomas got_worktree_get_root_path(worktree),
5042 ef899790 2022-11-01 thomas diff_staged ? " (staged changes)" : "");
5043 ef899790 2022-11-01 thomas *diff_header_shown = 1;
5046 ef899790 2022-11-01 thomas if (diff_staged) {
5047 ef899790 2022-11-01 thomas const char *label1 = NULL, *label2 = NULL;
5048 ef899790 2022-11-01 thomas switch (ct->staged_status) {
5049 ef899790 2022-11-01 thomas case GOT_STATUS_MODIFY:
5050 ef899790 2022-11-01 thomas label1 = ct->path;
5051 ef899790 2022-11-01 thomas label2 = ct->path;
5053 ef899790 2022-11-01 thomas case GOT_STATUS_ADD:
5054 ef899790 2022-11-01 thomas label2 = ct->path;
5056 ef899790 2022-11-01 thomas case GOT_STATUS_DELETE:
5057 ef899790 2022-11-01 thomas label1 = ct->path;
5059 ef899790 2022-11-01 thomas default:
5060 ef899790 2022-11-01 thomas return got_error(GOT_ERR_FILE_STATUS);
5062 ef899790 2022-11-01 thomas fd1 = got_opentempfd();
5063 ef899790 2022-11-01 thomas if (fd1 == -1) {
5064 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
5065 ef899790 2022-11-01 thomas goto done;
5067 ef899790 2022-11-01 thomas fd2 = got_opentempfd();
5068 ef899790 2022-11-01 thomas if (fd2 == -1) {
5069 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
5070 ef899790 2022-11-01 thomas goto done;
5072 ef899790 2022-11-01 thomas err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5073 ef899790 2022-11-01 thomas fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5074 53d03f97 2023-01-10 thomas label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, 0,
5075 53d03f97 2023-01-10 thomas NULL, repo, diff_outfile);
5076 ef899790 2022-11-01 thomas goto done;
5079 ef899790 2022-11-01 thomas fd1 = got_opentempfd();
5080 ef899790 2022-11-01 thomas if (fd1 == -1) {
5081 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentempfd");
5082 ef899790 2022-11-01 thomas goto done;
5085 ef899790 2022-11-01 thomas if (ct->status != GOT_STATUS_ADD) {
5086 ef899790 2022-11-01 thomas err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5087 ef899790 2022-11-01 thomas 8192, fd1);
5088 ef899790 2022-11-01 thomas if (err)
5089 ef899790 2022-11-01 thomas goto done;
5092 ef899790 2022-11-01 thomas if (ct->status != GOT_STATUS_DELETE) {
5093 ef899790 2022-11-01 thomas if (dirfd != -1) {
5094 ef899790 2022-11-01 thomas fd = openat(dirfd, de_name,
5095 ef899790 2022-11-01 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5096 ef899790 2022-11-01 thomas if (fd == -1) {
5097 ef899790 2022-11-01 thomas if (!got_err_open_nofollow_on_symlink()) {
5098 ef899790 2022-11-01 thomas err = got_error_from_errno2("openat",
5099 ef899790 2022-11-01 thomas ct->ondisk_path);
5100 ef899790 2022-11-01 thomas goto done;
5102 ef899790 2022-11-01 thomas err = get_symlink_target_file(&fd, dirfd,
5103 ef899790 2022-11-01 thomas de_name, ct->ondisk_path);
5104 ef899790 2022-11-01 thomas if (err)
5105 ef899790 2022-11-01 thomas goto done;
5107 ef899790 2022-11-01 thomas } else {
5108 ef899790 2022-11-01 thomas fd = open(ct->ondisk_path,
5109 ef899790 2022-11-01 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5110 ef899790 2022-11-01 thomas if (fd == -1) {
5111 ef899790 2022-11-01 thomas if (!got_err_open_nofollow_on_symlink()) {
5112 ef899790 2022-11-01 thomas err = got_error_from_errno2("open",
5113 ef899790 2022-11-01 thomas ct->ondisk_path);
5114 ef899790 2022-11-01 thomas goto done;
5116 ef899790 2022-11-01 thomas err = get_symlink_target_file(&fd, dirfd,
5117 ef899790 2022-11-01 thomas de_name, ct->ondisk_path);
5118 ef899790 2022-11-01 thomas if (err)
5119 ef899790 2022-11-01 thomas goto done;
5122 ef899790 2022-11-01 thomas if (fstatat(fd, ct->ondisk_path, &sb,
5123 ef899790 2022-11-01 thomas AT_SYMLINK_NOFOLLOW) == -1) {
5124 ef899790 2022-11-01 thomas err = got_error_from_errno2("fstatat", ct->ondisk_path);
5125 ef899790 2022-11-01 thomas goto done;
5127 ef899790 2022-11-01 thomas ondisk_file = fdopen(fd, "r");
5128 ef899790 2022-11-01 thomas if (ondisk_file == NULL) {
5129 ef899790 2022-11-01 thomas err = got_error_from_errno2("fdopen", ct->ondisk_path);
5130 ef899790 2022-11-01 thomas goto done;
5132 ef899790 2022-11-01 thomas fd = -1;
5133 ef899790 2022-11-01 thomas f2_exists = 1;
5136 ef899790 2022-11-01 thomas if (blob1) {
5137 ef899790 2022-11-01 thomas err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5138 ef899790 2022-11-01 thomas f1, blob1);
5139 ef899790 2022-11-01 thomas if (err)
5140 ef899790 2022-11-01 thomas goto done;
5143 ef899790 2022-11-01 thomas err = got_diff_blob_file(blob1, f1, size1, label1,
5144 ef899790 2022-11-01 thomas ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5145 53d03f97 2023-01-10 thomas GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, 0, NULL, diff_outfile);
5147 ef899790 2022-11-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5148 ef899790 2022-11-01 thomas err = got_error_from_errno("close");
5149 ef899790 2022-11-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5150 ef899790 2022-11-01 thomas err = got_error_from_errno("close");
5151 ef899790 2022-11-01 thomas if (blob1)
5152 ef899790 2022-11-01 thomas got_object_blob_close(blob1);
5153 ef899790 2022-11-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
5154 ef899790 2022-11-01 thomas err = got_error_from_errno("close");
5155 ef899790 2022-11-01 thomas if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5156 ef899790 2022-11-01 thomas err = got_error_from_errno("fclose");
5157 ef899790 2022-11-01 thomas return err;
5160 c4296144 2019-05-09 stsp static const struct got_error *
5161 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
5162 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
5163 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5164 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
5166 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
5167 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
5168 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5169 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
5170 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
5171 768aea60 2019-05-09 stsp struct stat sb;
5173 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
5174 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
5175 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
5176 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
5177 5f8a88c6 2019-08-03 stsp return NULL;
5179 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
5180 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
5182 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
5183 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
5184 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
5185 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
5186 5f8a88c6 2019-08-03 stsp return NULL;
5189 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
5190 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5191 036813ee 2019-05-09 stsp goto done;
5193 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
5194 036813ee 2019-05-09 stsp parent_path = strdup("");
5195 69960a46 2019-05-09 stsp if (parent_path == NULL)
5196 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
5198 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
5200 69960a46 2019-05-09 stsp return err;
5203 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
5204 cf066bf8 2019-05-09 stsp if (ct == NULL) {
5205 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
5206 c4296144 2019-05-09 stsp goto done;
5209 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5210 768aea60 2019-05-09 stsp relpath) == -1) {
5211 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5212 768aea60 2019-05-09 stsp goto done;
5215 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
5216 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
5217 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
5218 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5219 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
5220 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
5221 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
5222 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
5224 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
5225 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
5228 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5229 0aeb8099 2020-07-23 stsp goto done;
5231 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
5232 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
5233 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
5234 12463d8b 2019-12-13 stsp if (dirfd != -1) {
5235 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
5236 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
5237 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
5238 12463d8b 2019-12-13 stsp ct->ondisk_path);
5239 12463d8b 2019-12-13 stsp goto done;
5241 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
5242 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
5243 768aea60 2019-05-09 stsp goto done;
5245 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5248 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5249 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5250 44d03001 2019-05-09 stsp relpath) == -1) {
5251 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5252 44d03001 2019-05-09 stsp goto done;
5255 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5256 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5257 35213c7c 2020-07-23 stsp int is_bad_symlink;
5258 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5259 35213c7c 2020-07-23 stsp ssize_t target_len;
5260 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5261 35213c7c 2020-07-23 stsp sizeof(target_path));
5262 35213c7c 2020-07-23 stsp if (target_len == -1) {
5263 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5264 35213c7c 2020-07-23 stsp ct->ondisk_path);
5265 35213c7c 2020-07-23 stsp goto done;
5267 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5268 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5270 35213c7c 2020-07-23 stsp goto done;
5271 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5272 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5273 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5274 35213c7c 2020-07-23 stsp goto done;
5279 cf066bf8 2019-05-09 stsp ct->status = status;
5280 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5281 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5282 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5283 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5284 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5285 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5286 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5287 b416585c 2019-05-13 stsp goto done;
5289 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5290 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5291 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5292 f0b75401 2019-08-03 stsp goto done;
5295 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5296 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5297 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5298 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5299 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5300 036813ee 2019-05-09 stsp goto done;
5303 24519714 2019-05-09 stsp ct->path = strdup(path);
5304 24519714 2019-05-09 stsp if (ct->path == NULL) {
5305 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5306 24519714 2019-05-09 stsp goto done;
5308 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5309 ef899790 2022-11-01 thomas if (err)
5310 ef899790 2022-11-01 thomas goto done;
5312 ef899790 2022-11-01 thomas if (a->diff_outfile && ct && new != NULL) {
5313 ef899790 2022-11-01 thomas err = append_ct_diff(ct, &a->diff_header_shown,
5314 ef899790 2022-11-01 thomas a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5315 b5bedbbb 2022-11-01 thomas a->have_staged_files, a->repo, a->worktree);
5316 ef899790 2022-11-01 thomas if (err)
5317 ef899790 2022-11-01 thomas goto done;
5320 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5321 ed175427 2019-05-09 stsp free_commitable(ct);
5322 24519714 2019-05-09 stsp free(parent_path);
5323 036813ee 2019-05-09 stsp free(path);
5324 a129376b 2019-03-28 stsp return err;
5327 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5328 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5329 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5330 036813ee 2019-05-09 stsp struct got_repository *);
5332 ed175427 2019-05-09 stsp static const struct got_error *
5333 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5334 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5335 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5336 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5337 afa376bf 2019-05-09 stsp struct got_repository *repo)
5339 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5340 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5341 036813ee 2019-05-09 stsp char *subpath;
5343 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5344 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5345 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5347 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5349 ed175427 2019-05-09 stsp return err;
5351 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5352 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5353 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5354 036813ee 2019-05-09 stsp free(subpath);
5355 036813ee 2019-05-09 stsp return err;
5358 036813ee 2019-05-09 stsp static const struct got_error *
5359 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5361 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5362 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5364 036813ee 2019-05-09 stsp *match = 0;
5366 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5367 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5368 0f63689d 2019-05-10 stsp return NULL;
5371 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5373 0f63689d 2019-05-10 stsp return err;
5374 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5375 036813ee 2019-05-09 stsp free(ct_parent_path);
5376 036813ee 2019-05-09 stsp return err;
5379 768aea60 2019-05-09 stsp static mode_t
5380 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5382 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5383 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5385 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5388 036813ee 2019-05-09 stsp static const struct got_error *
5389 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5390 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5392 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5394 036813ee 2019-05-09 stsp *new_te = NULL;
5396 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5398 036813ee 2019-05-09 stsp goto done;
5400 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5402 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5403 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5404 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5406 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5408 036813ee 2019-05-09 stsp if (err && *new_te) {
5409 56e0773d 2019-11-28 stsp free(*new_te);
5410 036813ee 2019-05-09 stsp *new_te = NULL;
5412 036813ee 2019-05-09 stsp return err;
5415 036813ee 2019-05-09 stsp static const struct got_error *
5416 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5417 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5419 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5420 102b254e 2020-10-19 stsp char *ct_name = NULL;
5422 036813ee 2019-05-09 stsp *new_te = NULL;
5424 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5425 036813ee 2019-05-09 stsp if (*new_te == NULL)
5426 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5428 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5430 036813ee 2019-05-09 stsp goto done;
5431 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5432 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5433 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5434 036813ee 2019-05-09 stsp goto done;
5437 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5439 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5440 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5441 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5443 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5445 102b254e 2020-10-19 stsp free(ct_name);
5446 036813ee 2019-05-09 stsp if (err && *new_te) {
5447 56e0773d 2019-11-28 stsp free(*new_te);
5448 036813ee 2019-05-09 stsp *new_te = NULL;
5450 036813ee 2019-05-09 stsp return err;
5453 036813ee 2019-05-09 stsp static const struct got_error *
5454 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5455 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5457 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5458 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5460 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5462 036813ee 2019-05-09 stsp return err;
5463 036813ee 2019-05-09 stsp if (new_pe == NULL)
5464 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5465 036813ee 2019-05-09 stsp return NULL;
5468 afa376bf 2019-05-09 stsp static const struct got_error *
5469 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5470 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5472 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5473 5f8a88c6 2019-08-03 stsp unsigned char status;
5475 ae1e948a 2021-09-28 thomas if (status_cb == NULL) /* no commit progress output desired */
5476 ae1e948a 2021-09-28 thomas return NULL;
5478 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5479 afa376bf 2019-05-09 stsp ct_path++;
5481 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5482 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5484 5f8a88c6 2019-08-03 stsp status = ct->status;
5486 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5487 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5490 036813ee 2019-05-09 stsp static const struct got_error *
5491 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5492 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5494 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5495 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5496 44d03001 2019-05-09 stsp char *te_path;
5498 44d03001 2019-05-09 stsp *modified = 0;
5500 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5501 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5502 44d03001 2019-05-09 stsp te->name) == -1)
5503 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5505 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5506 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5507 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5508 44d03001 2019-05-09 stsp strlen(te_path));
5509 62d463ca 2020-10-20 naddy if (*modified)
5513 44d03001 2019-05-09 stsp free(te_path);
5514 44d03001 2019-05-09 stsp return err;
5517 44d03001 2019-05-09 stsp static const struct got_error *
5518 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5519 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5520 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5522 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5523 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5525 036813ee 2019-05-09 stsp *ctp = NULL;
5527 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5528 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5529 036813ee 2019-05-09 stsp char *ct_name = NULL;
5530 036813ee 2019-05-09 stsp int path_matches;
5532 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5533 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5534 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5535 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5538 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5539 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5543 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5546 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5548 036813ee 2019-05-09 stsp return err;
5549 036813ee 2019-05-09 stsp if (!path_matches)
5552 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5554 d34b633e 2020-10-19 stsp return err;
5556 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5557 d34b633e 2020-10-19 stsp free(ct_name);
5560 d34b633e 2020-10-19 stsp free(ct_name);
5562 036813ee 2019-05-09 stsp *ctp = ct;
5566 2b496619 2019-07-10 stsp return err;
5569 2b496619 2019-07-10 stsp static const struct got_error *
5570 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5571 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5572 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5573 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5574 2b496619 2019-07-10 stsp struct got_repository *repo)
5576 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5577 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5578 2b496619 2019-07-10 stsp char *subtree_path;
5579 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5580 ba580f68 2020-03-22 stsp int nentries;
5582 2b496619 2019-07-10 stsp *new_tep = NULL;
5584 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5585 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5586 2b496619 2019-07-10 stsp child_path) == -1)
5587 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5589 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5590 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5591 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5592 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5594 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5595 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5596 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5597 2b496619 2019-07-10 stsp goto done;
5599 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5600 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5601 2b496619 2019-07-10 stsp if (err) {
5602 56e0773d 2019-11-28 stsp free(new_te);
5603 2b496619 2019-07-10 stsp goto done;
5605 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5608 2b496619 2019-07-10 stsp free(subtree_path);
5609 2b496619 2019-07-10 stsp if (err == NULL)
5610 2b496619 2019-07-10 stsp *new_tep = new_te;
5611 036813ee 2019-05-09 stsp return err;
5614 036813ee 2019-05-09 stsp static const struct got_error *
5615 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5616 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5617 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5618 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5619 036813ee 2019-05-09 stsp struct got_repository *repo)
5621 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5622 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5623 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5624 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5626 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5627 ba580f68 2020-03-22 stsp *nentries = 0;
5629 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5630 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5631 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5632 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5634 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5635 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5636 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5639 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5640 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5643 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5644 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5646 036813ee 2019-05-09 stsp goto done;
5648 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5649 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5650 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5652 036813ee 2019-05-09 stsp goto done;
5653 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5655 afa376bf 2019-05-09 stsp goto done;
5656 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5657 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5659 2f51b5b3 2019-05-09 stsp goto done;
5660 ba580f68 2020-03-22 stsp (*nentries)++;
5662 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5663 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5664 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5665 2b496619 2019-07-10 stsp == NULL) {
5666 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5667 2b496619 2019-07-10 stsp child_path, path_base_tree,
5668 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5671 2b496619 2019-07-10 stsp goto done;
5672 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5674 2b496619 2019-07-10 stsp goto done;
5675 ba580f68 2020-03-22 stsp (*nentries)++;
5680 2f51b5b3 2019-05-09 stsp if (base_tree) {
5681 56e0773d 2019-11-28 stsp int i, nbase_entries;
5682 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5683 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5684 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5685 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5687 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5688 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5689 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5690 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5692 63c5ca5d 2019-08-24 stsp goto done;
5693 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5695 63c5ca5d 2019-08-24 stsp goto done;
5696 ba580f68 2020-03-22 stsp (*nentries)++;
5700 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5701 44d03001 2019-05-09 stsp int modified;
5702 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5704 036813ee 2019-05-09 stsp goto done;
5705 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5706 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5708 2f51b5b3 2019-05-09 stsp goto done;
5709 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5710 44d03001 2019-05-09 stsp if (modified) {
5711 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5712 ba580f68 2020-03-22 stsp int nsubentries;
5713 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5714 ba580f68 2020-03-22 stsp &nsubentries, te,
5715 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5716 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5718 44d03001 2019-05-09 stsp goto done;
5719 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5720 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5721 ba580f68 2020-03-22 stsp free(new_id);
5724 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5725 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5726 56e0773d 2019-11-28 stsp free(new_id);
5728 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5730 036813ee 2019-05-09 stsp goto done;
5731 ba580f68 2020-03-22 stsp (*nentries)++;
5735 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5736 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5738 f66c734c 2019-09-22 stsp goto done;
5740 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5741 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5742 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5743 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5744 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5745 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5747 2f51b5b3 2019-05-09 stsp goto done;
5748 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5750 2f51b5b3 2019-05-09 stsp goto done;
5751 ba580f68 2020-03-22 stsp (*nentries)++;
5753 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5754 b416585c 2019-05-13 stsp status_arg);
5756 afa376bf 2019-05-09 stsp goto done;
5758 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5759 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5761 2f51b5b3 2019-05-09 stsp goto done;
5762 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5764 2f51b5b3 2019-05-09 stsp goto done;
5765 ba580f68 2020-03-22 stsp (*nentries)++;
5770 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5771 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5773 21c2d8be 2023-01-10 thomas got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5774 2e1fa222 2020-07-23 stsp return err;
5777 2e1fa222 2020-07-23 stsp static const struct got_error *
5778 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5779 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5780 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5781 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5783 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5784 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5785 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5787 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5788 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5789 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5791 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5793 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5794 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5795 437adc9d 2020-12-10 yzhong if (err)
5796 437adc9d 2020-12-10 yzhong goto done;
5799 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5800 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5801 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5802 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5803 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5804 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5805 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5806 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5808 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5809 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5810 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5811 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5812 72fd46fa 2019-09-06 stsp !have_staged_files);
5814 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5815 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5816 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5817 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5818 72fd46fa 2019-09-06 stsp !have_staged_files);
5820 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5822 437adc9d 2020-12-10 yzhong goto done;
5823 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5824 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5825 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5826 3969253a 2020-03-07 stsp if (err) {
5827 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5828 437adc9d 2020-12-10 yzhong goto done;
5830 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5831 3969253a 2020-03-07 stsp if (err) {
5832 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5833 437adc9d 2020-12-10 yzhong goto done;
5836 437adc9d 2020-12-10 yzhong free(relpath);
5837 437adc9d 2020-12-10 yzhong relpath = NULL;
5840 437adc9d 2020-12-10 yzhong free(relpath);
5841 d56d26ce 2019-05-10 stsp return err;
5845 d56d26ce 2019-05-10 stsp static const struct got_error *
5846 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5847 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5848 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5849 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5850 735ef5ac 2019-08-03 stsp int ood_errcode)
5852 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5853 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
5854 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5856 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5857 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5858 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5859 1a36436d 2019-06-10 stsp return NULL;
5861 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5862 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5864 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, head_commit_id);
5865 945f9229 2022-04-16 thomas if (err)
5866 945f9229 2022-04-16 thomas goto done;
5867 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5868 9bead371 2019-07-28 stsp if (err) {
5869 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5870 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5871 1a36436d 2019-06-10 stsp goto done;
5872 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5873 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5875 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5876 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, head_commit_id);
5877 945f9229 2022-04-16 thomas if (err)
5878 945f9229 2022-04-16 thomas goto done;
5879 945f9229 2022-04-16 thomas err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5880 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5881 1a36436d 2019-06-10 stsp goto done;
5882 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5886 945f9229 2022-04-16 thomas if (commit)
5887 945f9229 2022-04-16 thomas got_object_commit_close(commit);
5888 1a36436d 2019-06-10 stsp return err;
5891 ef20f542 2022-06-26 thomas static const struct got_error *
5892 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5893 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5894 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id,
5895 10604dce 2021-09-24 thomas struct got_object_id *parent_id2,
5896 10604dce 2021-09-24 thomas struct got_worktree *worktree,
5897 ef899790 2022-11-01 thomas const char *author, const char *committer, char *diff_path,
5898 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5899 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5900 afa376bf 2019-05-09 stsp struct got_repository *repo)
5902 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5903 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5904 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5905 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5906 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5907 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5908 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5909 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5910 10604dce 2021-09-24 thomas int nentries, nparents = 0;
5911 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5912 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5913 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5914 892eab0a 2022-07-22 thomas time_t timestamp;
5916 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5918 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5920 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5922 588edf97 2019-05-10 stsp goto done;
5924 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5926 588edf97 2019-05-10 stsp goto done;
5928 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5929 ef899790 2022-11-01 thomas err = commit_msg_cb(commitable_paths, diff_path,
5930 ef899790 2022-11-01 thomas &logmsg, commit_arg);
5935 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5936 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5940 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5941 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5942 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5943 cf066bf8 2019-05-09 stsp char *ondisk_path;
5945 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5946 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5947 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5950 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5951 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5952 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5955 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5956 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5957 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5958 cf066bf8 2019-05-09 stsp goto done;
5960 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5961 2e1fa222 2020-07-23 stsp free(ondisk_path);
5963 cf066bf8 2019-05-09 stsp goto done;
5966 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5967 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5968 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5970 036813ee 2019-05-09 stsp goto done;
5972 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5974 de18fc63 2019-05-09 stsp goto done;
5975 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5976 10604dce 2021-09-24 thomas nparents++;
5977 10604dce 2021-09-24 thomas if (parent_id2) {
5978 10604dce 2021-09-24 thomas err = got_object_qid_alloc(&pid, parent_id2);
5979 10604dce 2021-09-24 thomas if (err)
5980 10604dce 2021-09-24 thomas goto done;
5981 10604dce 2021-09-24 thomas STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5982 10604dce 2021-09-24 thomas nparents++;
5984 892eab0a 2022-07-22 thomas timestamp = time(NULL);
5985 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5986 892eab0a 2022-07-22 thomas nparents, author, timestamp, committer, timestamp, logmsg, repo);
5987 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5988 33ad4cbe 2019-05-12 jcs free(logmsg);
5990 9d40349a 2019-05-09 stsp goto done;
5992 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5993 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5994 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5995 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5996 09f5bd90 2019-05-09 stsp goto done;
5998 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5999 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6001 09f5bd90 2019-05-09 stsp goto done;
6002 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6004 ebf99748 2019-05-09 stsp goto done;
6005 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6006 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6007 09f5bd90 2019-05-09 stsp goto done;
6009 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
6010 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
6012 f2c16586 2019-05-09 stsp goto done;
6013 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
6015 f2c16586 2019-05-09 stsp goto done;
6017 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6019 09f5bd90 2019-05-09 stsp goto done;
6021 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
6023 ebf99748 2019-05-09 stsp goto done;
6025 10604dce 2021-09-24 thomas got_object_id_queue_free(&parent_ids);
6026 588edf97 2019-05-10 stsp if (head_tree)
6027 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
6028 588edf97 2019-05-10 stsp if (head_commit)
6029 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
6030 09f5bd90 2019-05-09 stsp free(head_commit_id2);
6031 2f17228e 2019-05-12 stsp if (head_ref2) {
6032 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
6033 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
6034 2f17228e 2019-05-12 stsp err = unlockerr;
6035 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
6037 39cd0ff6 2019-07-12 stsp return err;
6040 5c1e53bc 2019-07-28 stsp static const struct got_error *
6041 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
6042 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
6044 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
6045 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
6047 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
6048 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
6049 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
6051 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
6052 5c1e53bc 2019-07-28 stsp ct_path++;
6054 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
6055 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
6059 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
6060 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
6062 5c1e53bc 2019-07-28 stsp return NULL;
6065 f0b75401 2019-08-03 stsp static const struct got_error *
6066 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
6068 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
6070 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6071 f0b75401 2019-08-03 stsp *have_staged_files = 1;
6072 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
6075 f0b75401 2019-08-03 stsp return NULL;
6078 5f8a88c6 2019-08-03 stsp static const struct got_error *
6079 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
6080 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
6082 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
6083 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
6085 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6086 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
6088 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6089 5f8a88c6 2019-08-03 stsp if (ie == NULL)
6090 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6091 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6092 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
6093 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
6096 5f8a88c6 2019-08-03 stsp return NULL;
6099 39cd0ff6 2019-07-12 stsp const struct got_error *
6100 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
6101 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
6102 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
6103 ef899790 2022-11-01 thomas int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6104 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
6105 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
6107 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6108 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
6109 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
6110 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6111 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6112 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
6113 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
6114 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6115 ef899790 2022-11-01 thomas char *diff_path = NULL;
6116 f0b75401 2019-08-03 stsp int have_staged_files = 0;
6118 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
6120 ef899790 2022-11-01 thomas memset(&cc_arg, 0, sizeof(cc_arg));
6121 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6123 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
6125 39cd0ff6 2019-07-12 stsp goto done;
6127 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6129 39cd0ff6 2019-07-12 stsp goto done;
6131 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6133 39cd0ff6 2019-07-12 stsp goto done;
6135 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6137 39cd0ff6 2019-07-12 stsp goto done;
6139 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6140 5f8a88c6 2019-08-03 stsp &have_staged_files);
6141 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
6142 5f8a88c6 2019-08-03 stsp goto done;
6143 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
6144 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
6146 5f8a88c6 2019-08-03 stsp goto done;
6149 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6150 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
6151 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
6152 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
6153 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
6154 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6155 ef899790 2022-11-01 thomas cc_arg.diff_header_shown = 0;
6156 ef899790 2022-11-01 thomas if (show_diff) {
6157 ef899790 2022-11-01 thomas err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6158 fc2a50f2 2022-11-01 thomas GOT_TMPDIR_STR "/got", ".diff");
6159 ef899790 2022-11-01 thomas if (err)
6160 ef899790 2022-11-01 thomas goto done;
6161 ef899790 2022-11-01 thomas cc_arg.f1 = got_opentemp();
6162 ef899790 2022-11-01 thomas if (cc_arg.f1 == NULL) {
6163 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentemp");
6164 ef899790 2022-11-01 thomas goto done;
6166 ef899790 2022-11-01 thomas cc_arg.f2 = got_opentemp();
6167 ef899790 2022-11-01 thomas if (cc_arg.f2 == NULL) {
6168 ef899790 2022-11-01 thomas err = got_error_from_errno("got_opentemp");
6169 ef899790 2022-11-01 thomas goto done;
6173 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6174 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6175 43896ae6 2022-09-02 thomas collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6177 5c1e53bc 2019-07-28 stsp goto done;
6180 ef899790 2022-11-01 thomas if (show_diff) {
6181 ef899790 2022-11-01 thomas if (fflush(cc_arg.diff_outfile) == EOF) {
6182 ef899790 2022-11-01 thomas err = got_error_from_errno("fflush");
6183 ef899790 2022-11-01 thomas goto done;
6187 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6188 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6189 39cd0ff6 2019-07-12 stsp goto done;
6192 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
6193 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
6195 5c1e53bc 2019-07-28 stsp goto done;
6198 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6199 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
6200 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
6202 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
6203 f0b75401 2019-08-03 stsp ct_path++;
6204 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
6205 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6206 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6208 b50cabdf 2019-07-12 stsp goto done;
6212 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
6213 9e1ed038 2022-11-01 thomas head_commit_id, NULL, worktree, author, committer,
6214 9e1ed038 2022-11-01 thomas (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6215 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6217 39cd0ff6 2019-07-12 stsp goto done;
6219 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6220 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
6221 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6222 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
6223 39cd0ff6 2019-07-12 stsp err = sync_err;
6225 39cd0ff6 2019-07-12 stsp if (fileindex)
6226 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
6227 39cd0ff6 2019-07-12 stsp free(fileindex_path);
6228 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6229 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
6230 39cd0ff6 2019-07-12 stsp err = unlockerr;
6231 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
6232 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
6234 39cd0ff6 2019-07-12 stsp free_commitable(ct);
6236 21c2d8be 2023-01-10 thomas got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6237 ef899790 2022-11-01 thomas if (diff_path && unlink(diff_path) == -1 && err == NULL)
6238 ef899790 2022-11-01 thomas err = got_error_from_errno2("unlink", diff_path);
6239 ef899790 2022-11-01 thomas free(diff_path);
6240 ef899790 2022-11-01 thomas if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6241 ef899790 2022-11-01 thomas err == NULL)
6242 ef899790 2022-11-01 thomas err = got_error_from_errno("fclose");
6243 c4296144 2019-05-09 stsp return err;
6246 8656d6c4 2019-05-20 stsp const char *
6247 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
6249 8656d6c4 2019-05-20 stsp return ct->path;
6252 8656d6c4 2019-05-20 stsp unsigned int
6253 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
6255 8656d6c4 2019-05-20 stsp return ct->status;
6258 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
6259 818c7501 2019-07-11 stsp struct got_worktree *worktree;
6260 818c7501 2019-07-11 stsp struct got_repository *repo;
6263 818c7501 2019-07-11 stsp static const struct got_error *
6264 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6266 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6267 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
6268 818c7501 2019-07-11 stsp unsigned char status;
6269 818c7501 2019-07-11 stsp struct stat sb;
6270 818c7501 2019-07-11 stsp char *ondisk_path;
6272 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
6273 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6274 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
6275 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
6277 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6279 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
6281 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
6282 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6283 818c7501 2019-07-11 stsp free(ondisk_path);
6285 818c7501 2019-07-11 stsp return err;
6287 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
6288 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
6289 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6290 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6292 818c7501 2019-07-11 stsp return NULL;
6295 818c7501 2019-07-11 stsp const struct got_error *
6296 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6297 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6298 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
6299 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6301 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
6302 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6303 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6304 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6305 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6306 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6307 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6309 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6310 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6311 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6313 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6315 818c7501 2019-07-11 stsp return err;
6317 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6319 818c7501 2019-07-11 stsp goto done;
6321 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6322 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6323 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6326 818c7501 2019-07-11 stsp goto done;
6328 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6330 818c7501 2019-07-11 stsp goto done;
6332 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6334 818c7501 2019-07-11 stsp goto done;
6336 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6338 818c7501 2019-07-11 stsp goto done;
6340 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6343 e51d7b55 2020-01-04 stsp goto done;
6345 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6347 818c7501 2019-07-11 stsp goto done;
6348 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6349 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6350 e51d7b55 2020-01-04 stsp goto done;
6353 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6354 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6356 818c7501 2019-07-11 stsp goto done;
6357 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6359 818c7501 2019-07-11 stsp goto done;
6361 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6363 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6365 818c7501 2019-07-11 stsp goto done;
6367 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6369 818c7501 2019-07-11 stsp goto done;
6371 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6372 818c7501 2019-07-11 stsp worktree->base_commit_id);
6374 818c7501 2019-07-11 stsp goto done;
6375 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6377 818c7501 2019-07-11 stsp goto done;
6379 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6381 818c7501 2019-07-11 stsp goto done;
6383 818c7501 2019-07-11 stsp free(fileindex_path);
6384 818c7501 2019-07-11 stsp free(tmp_branch_name);
6385 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6386 818c7501 2019-07-11 stsp free(branch_ref_name);
6387 818c7501 2019-07-11 stsp if (branch_ref)
6388 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6389 818c7501 2019-07-11 stsp if (wt_branch)
6390 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6391 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6392 818c7501 2019-07-11 stsp if (err) {
6393 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6394 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6395 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6397 818c7501 2019-07-11 stsp if (*tmp_branch) {
6398 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6399 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6401 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6402 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6403 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6405 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6407 818c7501 2019-07-11 stsp return err;
6410 818c7501 2019-07-11 stsp const struct got_error *
6411 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6412 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6413 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6414 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6416 818c7501 2019-07-11 stsp const struct got_error *err;
6417 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6418 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6419 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6420 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6421 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6423 818c7501 2019-07-11 stsp *commit_id = NULL;
6424 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6425 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6426 3e3a69f1 2019-07-25 stsp *branch = NULL;
6427 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6429 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6431 3e3a69f1 2019-07-25 stsp return err;
6433 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6435 f032f1f7 2019-08-04 stsp goto done;
6437 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6438 f032f1f7 2019-08-04 stsp &have_staged_files);
6439 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6440 f032f1f7 2019-08-04 stsp goto done;
6441 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6442 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6443 3e3a69f1 2019-07-25 stsp goto done;
6446 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6448 f032f1f7 2019-08-04 stsp goto done;
6450 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6452 818c7501 2019-07-11 stsp goto done;
6454 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6456 818c7501 2019-07-11 stsp goto done;
6458 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6460 818c7501 2019-07-11 stsp goto done;
6462 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6464 818c7501 2019-07-11 stsp goto done;
6466 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6467 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6469 818c7501 2019-07-11 stsp goto done;
6471 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6473 818c7501 2019-07-11 stsp goto done;
6475 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6477 818c7501 2019-07-11 stsp goto done;
6479 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6480 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6482 818c7501 2019-07-11 stsp goto done;
6484 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6486 818c7501 2019-07-11 stsp goto done;
6488 818c7501 2019-07-11 stsp free(commit_ref_name);
6489 818c7501 2019-07-11 stsp free(branch_ref_name);
6490 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6491 818c7501 2019-07-11 stsp if (commit_ref)
6492 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6493 818c7501 2019-07-11 stsp if (branch_ref)
6494 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6495 818c7501 2019-07-11 stsp if (err) {
6496 818c7501 2019-07-11 stsp free(*commit_id);
6497 818c7501 2019-07-11 stsp *commit_id = NULL;
6498 818c7501 2019-07-11 stsp if (*tmp_branch) {
6499 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6500 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6502 818c7501 2019-07-11 stsp if (*new_base_branch) {
6503 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6504 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6506 818c7501 2019-07-11 stsp if (*branch) {
6507 818c7501 2019-07-11 stsp got_ref_close(*branch);
6508 818c7501 2019-07-11 stsp *branch = NULL;
6510 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6511 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6512 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6514 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6516 818c7501 2019-07-11 stsp return err;
6519 818c7501 2019-07-11 stsp const struct got_error *
6520 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6522 818c7501 2019-07-11 stsp const struct got_error *err;
6523 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6525 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6527 818c7501 2019-07-11 stsp return err;
6529 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6530 818c7501 2019-07-11 stsp free(tmp_branch_name);
6531 818c7501 2019-07-11 stsp return NULL;
6534 818c7501 2019-07-11 stsp static const struct got_error *
6535 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6536 ef899790 2022-11-01 thomas const char *diff_path, char **logmsg, void *arg)
6538 0ebf8283 2019-07-24 stsp *logmsg = arg;
6539 818c7501 2019-07-11 stsp return NULL;
6542 818c7501 2019-07-11 stsp static const struct got_error *
6543 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6544 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6545 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6546 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6548 818c7501 2019-07-11 stsp return NULL;
6551 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6552 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6553 01757395 2019-07-12 stsp void *progress_arg;
6554 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6557 01757395 2019-07-12 stsp static const struct got_error *
6558 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6560 01757395 2019-07-12 stsp const struct got_error *err;
6561 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6563 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6565 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6567 01757395 2019-07-12 stsp return err;
6569 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6570 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6571 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6572 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6573 01757395 2019-07-12 stsp return NULL;
6575 01757395 2019-07-12 stsp p = strdup(path);
6576 01757395 2019-07-12 stsp if (p == NULL)
6577 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6579 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6580 01757395 2019-07-12 stsp if (err || new == NULL)
6582 01757395 2019-07-12 stsp return err;
6585 0ebf8283 2019-07-24 stsp static const struct got_error *
6586 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6587 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6589 818c7501 2019-07-11 stsp const struct got_error *err;
6590 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6592 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6593 818c7501 2019-07-11 stsp if (err) {
6594 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6595 818c7501 2019-07-11 stsp goto done;
6596 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6598 818c7501 2019-07-11 stsp goto done;
6599 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6601 818c7501 2019-07-11 stsp goto done;
6602 de05890f 2020-03-05 stsp } else if (is_rebase) {
6603 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6606 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6608 818c7501 2019-07-11 stsp goto done;
6609 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6610 818c7501 2019-07-11 stsp free(stored_id);
6611 818c7501 2019-07-11 stsp if (cmp != 0) {
6612 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6613 818c7501 2019-07-11 stsp goto done;
6617 0ebf8283 2019-07-24 stsp if (commit_ref)
6618 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6619 0ebf8283 2019-07-24 stsp return err;
6622 0ebf8283 2019-07-24 stsp static const struct got_error *
6623 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6624 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6625 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6626 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6627 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6628 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6630 0ebf8283 2019-07-24 stsp const struct got_error *err;
6631 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6632 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6633 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6635 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6637 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6639 0ebf8283 2019-07-24 stsp return err;
6641 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6642 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6643 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6644 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6645 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6646 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6647 818c7501 2019-07-11 stsp if (commit_ref)
6648 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6649 818c7501 2019-07-11 stsp return err;
6652 818c7501 2019-07-11 stsp const struct got_error *
6653 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6654 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6655 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6656 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6657 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6658 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6660 0ebf8283 2019-07-24 stsp const struct got_error *err;
6661 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6663 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6665 0ebf8283 2019-07-24 stsp return err;
6667 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6669 0ebf8283 2019-07-24 stsp goto done;
6671 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6672 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6673 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6675 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6676 0ebf8283 2019-07-24 stsp return err;
6679 0ebf8283 2019-07-24 stsp const struct got_error *
6680 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6681 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6682 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6683 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6684 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6685 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6687 0ebf8283 2019-07-24 stsp const struct got_error *err;
6688 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6690 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6692 0ebf8283 2019-07-24 stsp return err;
6694 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6696 0ebf8283 2019-07-24 stsp goto done;
6698 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6699 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6700 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6702 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6703 0ebf8283 2019-07-24 stsp return err;
6706 0ebf8283 2019-07-24 stsp static const struct got_error *
6707 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6708 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6709 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6710 150d7275 2022-07-22 thomas struct got_reference *tmp_branch, const char *committer,
6711 150d7275 2022-07-22 thomas struct got_commit_object *orig_commit, const char *new_logmsg,
6712 150d7275 2022-07-22 thomas struct got_repository *repo)
6714 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6715 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6716 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6717 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6718 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6719 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6720 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6722 ef899790 2022-11-01 thomas memset(&cc_arg, 0, sizeof(cc_arg));
6723 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6724 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6726 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6728 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6730 3e3a69f1 2019-07-25 stsp return err;
6732 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6733 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6734 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6735 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6737 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6738 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6740 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6741 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6742 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6743 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6744 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6745 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6747 01757395 2019-07-12 stsp if (merged_paths) {
6748 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6749 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6750 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6751 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6754 01757395 2019-07-12 stsp goto done;
6757 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6758 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6760 01757395 2019-07-12 stsp goto done;
6763 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6764 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6765 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6767 a0e95631 2019-07-12 stsp goto done;
6768 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6769 a0e95631 2019-07-12 stsp goto done;
6772 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6774 edd02c5e 2019-07-11 stsp goto done;
6776 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6778 818c7501 2019-07-11 stsp goto done;
6780 5943eee2 2019-08-13 stsp if (new_logmsg) {
6781 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6782 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6783 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6784 5943eee2 2019-08-13 stsp goto done;
6787 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6789 5943eee2 2019-08-13 stsp goto done;
6792 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6793 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6794 10604dce 2021-09-24 thomas NULL, worktree, got_object_commit_get_author(orig_commit),
6795 8db00f97 2022-07-22 thomas committer ? committer :
6796 ef899790 2022-11-01 thomas got_object_commit_get_committer(orig_commit), NULL,
6797 8db00f97 2022-07-22 thomas collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6799 a0e95631 2019-07-12 stsp goto done;
6801 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6803 a0e95631 2019-07-12 stsp goto done;
6805 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6807 a0e95631 2019-07-12 stsp goto done;
6809 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6810 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6811 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6812 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6813 a0e95631 2019-07-12 stsp err = sync_err;
6815 a0e95631 2019-07-12 stsp free(fileindex_path);
6816 a0e95631 2019-07-12 stsp free(head_commit_id);
6817 a0e95631 2019-07-12 stsp if (head_ref)
6818 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6819 818c7501 2019-07-11 stsp if (err) {
6820 818c7501 2019-07-11 stsp free(*new_commit_id);
6821 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6823 818c7501 2019-07-11 stsp return err;
6826 818c7501 2019-07-11 stsp const struct got_error *
6827 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6828 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6829 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6830 150d7275 2022-07-22 thomas const char *committer, struct got_commit_object *orig_commit,
6831 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6833 0ebf8283 2019-07-24 stsp const struct got_error *err;
6834 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6835 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6836 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6838 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6840 0ebf8283 2019-07-24 stsp return err;
6842 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6844 0ebf8283 2019-07-24 stsp goto done;
6845 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6847 0ebf8283 2019-07-24 stsp goto done;
6848 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6849 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6850 0ebf8283 2019-07-24 stsp goto done;
6853 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6854 150d7275 2022-07-22 thomas worktree, fileindex, tmp_branch, committer, orig_commit,
6855 150d7275 2022-07-22 thomas NULL, repo);
6857 0ebf8283 2019-07-24 stsp if (commit_ref)
6858 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6859 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6860 0ebf8283 2019-07-24 stsp free(commit_id);
6861 0ebf8283 2019-07-24 stsp return err;
6864 0ebf8283 2019-07-24 stsp const struct got_error *
6865 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6866 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6867 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6868 150d7275 2022-07-22 thomas const char *committer, struct got_commit_object *orig_commit,
6869 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6870 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6872 0ebf8283 2019-07-24 stsp const struct got_error *err;
6873 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6874 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6876 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6878 0ebf8283 2019-07-24 stsp return err;
6880 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6882 0ebf8283 2019-07-24 stsp goto done;
6884 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6885 150d7275 2022-07-22 thomas worktree, fileindex, tmp_branch, committer, orig_commit,
6886 150d7275 2022-07-22 thomas new_logmsg, repo);
6888 0ebf8283 2019-07-24 stsp if (commit_ref)
6889 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6890 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6891 0ebf8283 2019-07-24 stsp return err;
6894 0ebf8283 2019-07-24 stsp const struct got_error *
6895 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6896 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6898 3e3a69f1 2019-07-25 stsp if (fileindex)
6899 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6900 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6903 69844fba 2019-07-11 stsp static const struct got_error *
6904 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6906 69844fba 2019-07-11 stsp const struct got_error *err;
6907 69844fba 2019-07-11 stsp struct got_reference *ref;
6909 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6910 69844fba 2019-07-11 stsp if (err) {
6911 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6912 69844fba 2019-07-11 stsp return NULL;
6913 69844fba 2019-07-11 stsp return err;
6916 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6917 69844fba 2019-07-11 stsp got_ref_close(ref);
6918 69844fba 2019-07-11 stsp return err;
6921 69844fba 2019-07-11 stsp static const struct got_error *
6922 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6924 69844fba 2019-07-11 stsp const struct got_error *err;
6925 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6926 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6928 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6930 69844fba 2019-07-11 stsp goto done;
6931 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6933 69844fba 2019-07-11 stsp goto done;
6935 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6937 69844fba 2019-07-11 stsp goto done;
6938 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6940 69844fba 2019-07-11 stsp goto done;
6942 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6944 69844fba 2019-07-11 stsp goto done;
6945 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6947 69844fba 2019-07-11 stsp goto done;
6949 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6951 69844fba 2019-07-11 stsp goto done;
6952 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6954 69844fba 2019-07-11 stsp goto done;
6957 69844fba 2019-07-11 stsp free(tmp_branch_name);
6958 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6959 69844fba 2019-07-11 stsp free(branch_ref_name);
6960 69844fba 2019-07-11 stsp free(commit_ref_name);
6961 e600f124 2021-03-21 stsp return err;
6964 ef20f542 2022-06-26 thomas static const struct got_error *
6965 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6966 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6968 e600f124 2021-03-21 stsp const struct got_error *err;
6969 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6970 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6971 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6972 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6973 e600f124 2021-03-21 stsp char *refname = NULL;
6975 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6976 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6977 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6978 e600f124 2021-03-21 stsp branch_name += 11;
6980 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6982 e600f124 2021-03-21 stsp return err;
6984 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6985 e600f124 2021-03-21 stsp new_id_str) == -1) {
6986 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6987 e600f124 2021-03-21 stsp goto done;
6990 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6992 e600f124 2021-03-21 stsp goto done;
6994 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6996 e600f124 2021-03-21 stsp goto done;
6998 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
7000 e600f124 2021-03-21 stsp free(new_id_str);
7001 e600f124 2021-03-21 stsp free(refname);
7002 e600f124 2021-03-21 stsp free(old_commit_id);
7004 e600f124 2021-03-21 stsp got_ref_close(ref);
7005 69844fba 2019-07-11 stsp return err;
7008 818c7501 2019-07-11 stsp const struct got_error *
7009 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
7010 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
7011 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
7012 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
7014 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7015 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
7016 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7018 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7020 818c7501 2019-07-11 stsp return err;
7022 e600f124 2021-03-21 stsp if (create_backup) {
7023 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7024 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
7026 e600f124 2021-03-21 stsp goto done;
7029 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7031 818c7501 2019-07-11 stsp goto done;
7033 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
7035 818c7501 2019-07-11 stsp goto done;
7037 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
7039 818c7501 2019-07-11 stsp goto done;
7041 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
7043 a615e0e7 2020-12-16 stsp goto done;
7045 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7047 a615e0e7 2020-12-16 stsp goto done;
7048 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7049 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7050 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7051 a615e0e7 2020-12-16 stsp err = sync_err;
7053 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7054 a615e0e7 2020-12-16 stsp free(fileindex_path);
7055 818c7501 2019-07-11 stsp free(new_head_commit_id);
7056 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7057 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7058 818c7501 2019-07-11 stsp err = unlockerr;
7059 818c7501 2019-07-11 stsp return err;
7062 818c7501 2019-07-11 stsp const struct got_error *
7063 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
7064 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7065 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
7066 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
7068 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
7069 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
7070 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
7071 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7072 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
7073 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7074 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
7076 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
7078 818c7501 2019-07-11 stsp return err;
7080 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
7081 945f9229 2022-04-16 thomas worktree->base_commit_id);
7082 945f9229 2022-04-16 thomas if (err)
7083 945f9229 2022-04-16 thomas goto done;
7085 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
7086 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
7088 818c7501 2019-07-11 stsp goto done;
7090 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
7092 818c7501 2019-07-11 stsp goto done;
7095 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
7096 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
7097 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
7099 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
7101 818c7501 2019-07-11 stsp goto done;
7103 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7105 818c7501 2019-07-11 stsp goto done;
7107 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7108 945f9229 2022-04-16 thomas worktree->path_prefix);
7110 ca355955 2019-07-12 stsp goto done;
7112 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
7114 ca355955 2019-07-12 stsp goto done;
7116 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7118 818c7501 2019-07-11 stsp goto done;
7120 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7121 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7122 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7123 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7124 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7125 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7126 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7127 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
7128 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
7129 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7131 1f1abb7e 2019-08-08 stsp goto sync;
7133 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7134 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
7136 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7137 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
7138 ca355955 2019-07-12 stsp err = sync_err;
7140 818c7501 2019-07-11 stsp got_ref_close(resolved);
7141 a3a2faf2 2019-07-12 stsp free(tree_id);
7142 818c7501 2019-07-11 stsp free(commit_id);
7143 945f9229 2022-04-16 thomas if (commit)
7144 945f9229 2022-04-16 thomas got_object_commit_close(commit);
7145 0ebf8283 2019-07-24 stsp if (fileindex)
7146 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
7147 0ebf8283 2019-07-24 stsp free(fileindex_path);
7149 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7150 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7151 0ebf8283 2019-07-24 stsp err = unlockerr;
7152 0ebf8283 2019-07-24 stsp return err;
7155 0ebf8283 2019-07-24 stsp const struct got_error *
7156 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7157 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7158 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7159 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
7161 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
7162 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7163 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
7164 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
7165 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7166 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
7167 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
7168 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7170 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7171 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7172 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7173 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7175 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7177 0ebf8283 2019-07-24 stsp return err;
7179 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7181 0ebf8283 2019-07-24 stsp goto done;
7183 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
7184 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
7185 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7188 0ebf8283 2019-07-24 stsp goto done;
7190 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7192 0ebf8283 2019-07-24 stsp goto done;
7194 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7196 0ebf8283 2019-07-24 stsp goto done;
7198 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7199 0ebf8283 2019-07-24 stsp worktree);
7201 0ebf8283 2019-07-24 stsp goto done;
7203 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7206 0ebf8283 2019-07-24 stsp goto done;
7208 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7210 0ebf8283 2019-07-24 stsp goto done;
7212 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
7214 0ebf8283 2019-07-24 stsp goto done;
7216 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7217 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7219 0ebf8283 2019-07-24 stsp goto done;
7220 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
7222 0ebf8283 2019-07-24 stsp goto done;
7223 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7224 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
7225 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
7226 0ebf8283 2019-07-24 stsp goto done;
7229 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
7230 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
7232 0ebf8283 2019-07-24 stsp goto done;
7233 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
7235 0ebf8283 2019-07-24 stsp goto done;
7237 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
7239 0ebf8283 2019-07-24 stsp goto done;
7241 0ebf8283 2019-07-24 stsp free(fileindex_path);
7242 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7243 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7244 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7245 0ebf8283 2019-07-24 stsp if (wt_branch)
7246 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
7247 0ebf8283 2019-07-24 stsp if (err) {
7248 0ebf8283 2019-07-24 stsp if (*branch_ref) {
7249 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
7250 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
7252 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7253 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7254 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7256 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7257 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7258 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7259 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7261 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
7263 0ebf8283 2019-07-24 stsp return err;
7266 0ebf8283 2019-07-24 stsp const struct got_error *
7267 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
7268 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
7270 3e3a69f1 2019-07-25 stsp if (fileindex)
7271 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
7272 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
7275 0ebf8283 2019-07-24 stsp const struct got_error *
7276 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
7277 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
7279 0ebf8283 2019-07-24 stsp const struct got_error *err;
7280 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
7282 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7284 0ebf8283 2019-07-24 stsp return err;
7286 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7287 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7288 0ebf8283 2019-07-24 stsp return NULL;
7291 0ebf8283 2019-07-24 stsp const struct got_error *
7292 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
7293 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
7294 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7295 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7297 0ebf8283 2019-07-24 stsp const struct got_error *err;
7298 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7299 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7300 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
7301 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
7302 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
7303 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
7305 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7306 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7307 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7308 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7310 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7312 3e3a69f1 2019-07-25 stsp return err;
7314 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7316 f032f1f7 2019-08-04 stsp goto done;
7318 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7319 f032f1f7 2019-08-04 stsp &have_staged_files);
7320 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7321 f032f1f7 2019-08-04 stsp goto done;
7322 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7323 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7324 3e3a69f1 2019-07-25 stsp goto done;
7327 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7329 f032f1f7 2019-08-04 stsp goto done;
7331 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7333 0ebf8283 2019-07-24 stsp goto done;
7335 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7337 0ebf8283 2019-07-24 stsp goto done;
7339 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7340 0ebf8283 2019-07-24 stsp worktree);
7342 0ebf8283 2019-07-24 stsp goto done;
7344 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7346 0ebf8283 2019-07-24 stsp goto done;
7348 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7350 0ebf8283 2019-07-24 stsp goto done;
7351 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7353 0ebf8283 2019-07-24 stsp goto done;
7355 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7357 0ebf8283 2019-07-24 stsp goto done;
7358 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7360 0ebf8283 2019-07-24 stsp goto done;
7362 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7364 0ebf8283 2019-07-24 stsp goto done;
7366 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7367 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7368 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7369 0ebf8283 2019-07-24 stsp if (commit_ref)
7370 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7371 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7372 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7373 0ebf8283 2019-07-24 stsp if (err) {
7374 0ebf8283 2019-07-24 stsp free(*commit_id);
7375 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7376 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7377 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7378 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7379 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7380 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7382 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7383 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7384 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7386 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7388 0ebf8283 2019-07-24 stsp return err;
7391 0ebf8283 2019-07-24 stsp static const struct got_error *
7392 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7394 0ebf8283 2019-07-24 stsp const struct got_error *err;
7395 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7396 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7398 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7400 0ebf8283 2019-07-24 stsp goto done;
7401 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7403 0ebf8283 2019-07-24 stsp goto done;
7405 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7406 0ebf8283 2019-07-24 stsp worktree);
7408 0ebf8283 2019-07-24 stsp goto done;
7409 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7411 0ebf8283 2019-07-24 stsp goto done;
7413 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7415 0ebf8283 2019-07-24 stsp goto done;
7416 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7418 0ebf8283 2019-07-24 stsp goto done;
7420 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7422 0ebf8283 2019-07-24 stsp goto done;
7423 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7425 0ebf8283 2019-07-24 stsp goto done;
7427 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7428 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7429 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7430 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7431 0ebf8283 2019-07-24 stsp return err;
7434 0ebf8283 2019-07-24 stsp const struct got_error *
7435 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7436 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7437 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7438 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7440 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7441 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7442 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7443 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7444 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7445 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7447 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7449 0ebf8283 2019-07-24 stsp return err;
7451 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
7452 945f9229 2022-04-16 thomas worktree->base_commit_id);
7453 945f9229 2022-04-16 thomas if (err)
7454 945f9229 2022-04-16 thomas goto done;
7456 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7457 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7459 0ebf8283 2019-07-24 stsp goto done;
7461 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7463 0ebf8283 2019-07-24 stsp goto done;
7465 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7467 0ebf8283 2019-07-24 stsp goto done;
7469 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7470 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7472 0ebf8283 2019-07-24 stsp goto done;
7474 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7476 0ebf8283 2019-07-24 stsp goto done;
7478 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7480 0ebf8283 2019-07-24 stsp goto done;
7482 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7483 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7484 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7485 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7486 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7487 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7488 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7489 10604dce 2021-09-24 thomas rfa.unlink_added_files = 0;
7490 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7491 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
7493 1f1abb7e 2019-08-08 stsp goto sync;
7495 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7496 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7498 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7499 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7500 0ebf8283 2019-07-24 stsp err = sync_err;
7502 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7503 0ebf8283 2019-07-24 stsp free(tree_id);
7504 818c7501 2019-07-11 stsp free(fileindex_path);
7506 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7507 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7508 818c7501 2019-07-11 stsp err = unlockerr;
7509 818c7501 2019-07-11 stsp return err;
7512 0ebf8283 2019-07-24 stsp const struct got_error *
7513 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7514 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7515 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7517 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7518 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7519 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7520 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7522 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7524 0ebf8283 2019-07-24 stsp return err;
7526 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7527 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7529 e600f124 2021-03-21 stsp goto done;
7531 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7532 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7534 0ebf8283 2019-07-24 stsp goto done;
7536 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7538 0ebf8283 2019-07-24 stsp goto done;
7540 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7542 0ebf8283 2019-07-24 stsp goto done;
7544 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7546 0ebf8283 2019-07-24 stsp goto done;
7548 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7550 a615e0e7 2020-12-16 stsp goto done;
7552 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7554 a615e0e7 2020-12-16 stsp goto done;
7555 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7556 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7557 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7558 a615e0e7 2020-12-16 stsp err = sync_err;
7560 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7561 a615e0e7 2020-12-16 stsp free(fileindex_path);
7562 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7563 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7564 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7565 0ebf8283 2019-07-24 stsp err = unlockerr;
7566 0ebf8283 2019-07-24 stsp return err;
7569 0ebf8283 2019-07-24 stsp const struct got_error *
7570 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7571 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7573 0ebf8283 2019-07-24 stsp const struct got_error *err;
7574 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7576 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7578 0ebf8283 2019-07-24 stsp return err;
7580 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7582 0ebf8283 2019-07-24 stsp goto done;
7584 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7586 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7587 2822a352 2019-10-15 stsp return err;
7590 2822a352 2019-10-15 stsp const struct got_error *
7591 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7592 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7593 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7594 2822a352 2019-10-15 stsp struct got_repository *repo)
7596 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7597 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7598 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7600 2822a352 2019-10-15 stsp *fileindex = NULL;
7601 2822a352 2019-10-15 stsp *branch_ref = NULL;
7602 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7604 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7606 2822a352 2019-10-15 stsp return err;
7608 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7609 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7610 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7611 2822a352 2019-10-15 stsp "update -b or different branch name required");
7612 2822a352 2019-10-15 stsp goto done;
7615 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7617 2822a352 2019-10-15 stsp goto done;
7619 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7620 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7621 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7622 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7625 2822a352 2019-10-15 stsp goto done;
7627 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7629 2822a352 2019-10-15 stsp goto done;
7631 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7632 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7634 2822a352 2019-10-15 stsp if (err) {
7635 2822a352 2019-10-15 stsp if (*branch_ref) {
7636 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7637 2822a352 2019-10-15 stsp *branch_ref = NULL;
7639 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7640 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7641 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7643 2822a352 2019-10-15 stsp if (*fileindex) {
7644 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7645 2822a352 2019-10-15 stsp *fileindex = NULL;
7647 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7649 0cb83759 2019-08-03 stsp return err;
7652 2822a352 2019-10-15 stsp const struct got_error *
7653 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7654 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7655 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7656 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7657 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7659 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7660 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7661 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7662 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
7664 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7666 2822a352 2019-10-15 stsp goto done;
7668 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7670 2822a352 2019-10-15 stsp goto done;
7672 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo, commit_id);
7673 945f9229 2022-04-16 thomas if (err)
7674 945f9229 2022-04-16 thomas goto done;
7676 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
7677 2822a352 2019-10-15 stsp worktree->path_prefix);
7679 2822a352 2019-10-15 stsp goto done;
7681 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7683 2822a352 2019-10-15 stsp goto done;
7685 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7686 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7688 2822a352 2019-10-15 stsp goto sync;
7690 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7692 2822a352 2019-10-15 stsp goto sync;
7694 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7696 6e210706 2021-01-22 stsp goto sync;
7698 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7700 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7701 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7702 2822a352 2019-10-15 stsp err = sync_err;
7705 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7706 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7707 2822a352 2019-10-15 stsp err = unlockerr;
7708 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7710 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7711 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7712 2822a352 2019-10-15 stsp err = unlockerr;
7713 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7715 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7716 2822a352 2019-10-15 stsp free(fileindex_path);
7717 2822a352 2019-10-15 stsp free(tree_id);
7718 945f9229 2022-04-16 thomas if (commit)
7719 945f9229 2022-04-16 thomas got_object_commit_close(commit);
7721 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7722 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7723 2822a352 2019-10-15 stsp err = unlockerr;
7724 2822a352 2019-10-15 stsp return err;
7727 2822a352 2019-10-15 stsp const struct got_error *
7728 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7729 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7730 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7732 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7734 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7736 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7738 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7739 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7740 8b692cd0 2019-10-21 stsp err = unlockerr;
7741 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7743 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7744 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7745 8b692cd0 2019-10-21 stsp err = unlockerr;
7746 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7748 10604dce 2021-09-24 thomas return err;
7751 10604dce 2021-09-24 thomas const struct got_error *
7752 10604dce 2021-09-24 thomas got_worktree_merge_postpone(struct got_worktree *worktree,
7753 10604dce 2021-09-24 thomas struct got_fileindex *fileindex)
7755 10604dce 2021-09-24 thomas const struct got_error *err, *sync_err;
7756 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7758 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7759 10604dce 2021-09-24 thomas if (err)
7760 10604dce 2021-09-24 thomas goto done;
7762 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7764 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_SH);
7765 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7766 10604dce 2021-09-24 thomas err = sync_err;
7768 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7769 10604dce 2021-09-24 thomas free(fileindex_path);
7770 8b692cd0 2019-10-21 stsp return err;
7773 10604dce 2021-09-24 thomas static const struct got_error *
7774 10604dce 2021-09-24 thomas delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7776 10604dce 2021-09-24 thomas const struct got_error *err;
7777 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
7779 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7780 10604dce 2021-09-24 thomas if (err)
7781 10604dce 2021-09-24 thomas goto done;
7782 10604dce 2021-09-24 thomas err = delete_ref(branch_refname, repo);
7783 10604dce 2021-09-24 thomas if (err)
7784 10604dce 2021-09-24 thomas goto done;
7786 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
7787 10604dce 2021-09-24 thomas if (err)
7788 10604dce 2021-09-24 thomas goto done;
7789 10604dce 2021-09-24 thomas err = delete_ref(commit_refname, repo);
7790 10604dce 2021-09-24 thomas if (err)
7791 10604dce 2021-09-24 thomas goto done;
7794 10604dce 2021-09-24 thomas free(branch_refname);
7795 10604dce 2021-09-24 thomas free(commit_refname);
7796 10604dce 2021-09-24 thomas return err;
7799 10604dce 2021-09-24 thomas struct merge_commit_msg_arg {
7800 10604dce 2021-09-24 thomas struct got_worktree *worktree;
7801 10604dce 2021-09-24 thomas const char *branch_name;
7804 10604dce 2021-09-24 thomas static const struct got_error *
7805 ef899790 2022-11-01 thomas merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7806 ef899790 2022-11-01 thomas const char *diff_path, char **logmsg, void *arg)
7808 10604dce 2021-09-24 thomas struct merge_commit_msg_arg *a = arg;
7810 10604dce 2021-09-24 thomas if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7811 10604dce 2021-09-24 thomas got_worktree_get_head_ref_name(a->worktree)) == -1)
7812 10604dce 2021-09-24 thomas return got_error_from_errno("asprintf");
7814 10604dce 2021-09-24 thomas return NULL;
7818 10604dce 2021-09-24 thomas const struct got_error *
7819 10604dce 2021-09-24 thomas got_worktree_merge_branch(struct got_worktree *worktree,
7820 10604dce 2021-09-24 thomas struct got_fileindex *fileindex,
7821 10604dce 2021-09-24 thomas struct got_object_id *yca_commit_id,
7822 10604dce 2021-09-24 thomas struct got_object_id *branch_tip,
7823 10604dce 2021-09-24 thomas struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7824 10604dce 2021-09-24 thomas void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7826 10604dce 2021-09-24 thomas const struct got_error *err;
7827 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7829 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7830 10604dce 2021-09-24 thomas if (err)
7831 10604dce 2021-09-24 thomas goto done;
7833 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7834 10604dce 2021-09-24 thomas worktree);
7835 10604dce 2021-09-24 thomas if (err)
7836 10604dce 2021-09-24 thomas goto done;
7838 10604dce 2021-09-24 thomas err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7839 10604dce 2021-09-24 thomas branch_tip, repo, progress_cb, progress_arg,
7840 10604dce 2021-09-24 thomas cancel_cb, cancel_arg);
7842 10604dce 2021-09-24 thomas free(fileindex_path);
7843 10604dce 2021-09-24 thomas return err;
7846 10604dce 2021-09-24 thomas const struct got_error *
7847 10604dce 2021-09-24 thomas got_worktree_merge_commit(struct got_object_id **new_commit_id,
7848 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
7849 10604dce 2021-09-24 thomas const char *author, const char *committer, int allow_bad_symlinks,
7850 10604dce 2021-09-24 thomas struct got_object_id *branch_tip, const char *branch_name,
7851 ae1e948a 2021-09-28 thomas struct got_repository *repo,
7852 ae1e948a 2021-09-28 thomas got_worktree_status_cb status_cb, void *status_arg)
7855 10604dce 2021-09-24 thomas const struct got_error *err = NULL, *sync_err;
7856 10604dce 2021-09-24 thomas struct got_pathlist_head commitable_paths;
7857 10604dce 2021-09-24 thomas struct collect_commitables_arg cc_arg;
7858 10604dce 2021-09-24 thomas struct got_pathlist_entry *pe;
7859 10604dce 2021-09-24 thomas struct got_reference *head_ref = NULL;
7860 10604dce 2021-09-24 thomas struct got_object_id *head_commit_id = NULL;
7861 10604dce 2021-09-24 thomas int have_staged_files = 0;
7862 10604dce 2021-09-24 thomas struct merge_commit_msg_arg mcm_arg;
7863 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7865 ef899790 2022-11-01 thomas memset(&cc_arg, 0, sizeof(cc_arg));
7866 10604dce 2021-09-24 thomas *new_commit_id = NULL;
7868 10604dce 2021-09-24 thomas TAILQ_INIT(&commitable_paths);
7870 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7871 10604dce 2021-09-24 thomas if (err)
7872 10604dce 2021-09-24 thomas goto done;
7874 10604dce 2021-09-24 thomas err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7875 10604dce 2021-09-24 thomas if (err)
7876 10604dce 2021-09-24 thomas goto done;
7878 10604dce 2021-09-24 thomas err = got_ref_resolve(&head_commit_id, repo, head_ref);
7879 10604dce 2021-09-24 thomas if (err)
7880 10604dce 2021-09-24 thomas goto done;
7882 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7883 10604dce 2021-09-24 thomas &have_staged_files);
7884 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
7885 10604dce 2021-09-24 thomas goto done;
7886 10604dce 2021-09-24 thomas if (have_staged_files) {
7887 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7888 10604dce 2021-09-24 thomas goto done;
7891 10604dce 2021-09-24 thomas cc_arg.commitable_paths = &commitable_paths;
7892 10604dce 2021-09-24 thomas cc_arg.worktree = worktree;
7893 10604dce 2021-09-24 thomas cc_arg.fileindex = fileindex;
7894 10604dce 2021-09-24 thomas cc_arg.repo = repo;
7895 10604dce 2021-09-24 thomas cc_arg.have_staged_files = have_staged_files;
7896 10604dce 2021-09-24 thomas cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7897 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
7898 6092c299 2021-10-04 thomas collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7899 10604dce 2021-09-24 thomas if (err)
7900 10604dce 2021-09-24 thomas goto done;
7902 10604dce 2021-09-24 thomas if (TAILQ_EMPTY(&commitable_paths)) {
7903 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7904 10604dce 2021-09-24 thomas "merge of %s cannot proceed", branch_name);
7905 10604dce 2021-09-24 thomas goto done;
7908 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7909 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7910 10604dce 2021-09-24 thomas const char *ct_path = ct->in_repo_path;
7912 10604dce 2021-09-24 thomas while (ct_path[0] == '/')
7913 10604dce 2021-09-24 thomas ct_path++;
7914 10604dce 2021-09-24 thomas err = check_out_of_date(ct_path, ct->status,
7915 10604dce 2021-09-24 thomas ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7916 10604dce 2021-09-24 thomas head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7917 10604dce 2021-09-24 thomas if (err)
7918 10604dce 2021-09-24 thomas goto done;
7922 10604dce 2021-09-24 thomas mcm_arg.worktree = worktree;
7923 10604dce 2021-09-24 thomas mcm_arg.branch_name = branch_name;
7924 10604dce 2021-09-24 thomas err = commit_worktree(new_commit_id, &commitable_paths,
7925 ef899790 2022-11-01 thomas head_commit_id, branch_tip, worktree, author, committer, NULL,
7926 ae1e948a 2021-09-28 thomas merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7927 10604dce 2021-09-24 thomas if (err)
7928 10604dce 2021-09-24 thomas goto done;
7930 10604dce 2021-09-24 thomas err = update_fileindex_after_commit(worktree, &commitable_paths,
7931 10604dce 2021-09-24 thomas *new_commit_id, fileindex, have_staged_files);
7932 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7933 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7934 10604dce 2021-09-24 thomas err = sync_err;
7936 10604dce 2021-09-24 thomas TAILQ_FOREACH(pe, &commitable_paths, entry) {
7937 10604dce 2021-09-24 thomas struct got_commitable *ct = pe->data;
7939 10604dce 2021-09-24 thomas free_commitable(ct);
7941 21c2d8be 2023-01-10 thomas got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
7942 10604dce 2021-09-24 thomas free(fileindex_path);
7943 10604dce 2021-09-24 thomas return err;
7946 10604dce 2021-09-24 thomas const struct got_error *
7947 10604dce 2021-09-24 thomas got_worktree_merge_complete(struct got_worktree *worktree,
7948 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo)
7950 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
7951 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
7953 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
7954 10604dce 2021-09-24 thomas if (err)
7955 10604dce 2021-09-24 thomas goto done;
7957 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
7958 10604dce 2021-09-24 thomas if (err)
7959 10604dce 2021-09-24 thomas goto done;
7960 10604dce 2021-09-24 thomas err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7961 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
7962 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
7963 10604dce 2021-09-24 thomas err = sync_err;
7965 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
7966 10604dce 2021-09-24 thomas free(fileindex_path);
7967 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
7968 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
7969 10604dce 2021-09-24 thomas err = unlockerr;
7970 10604dce 2021-09-24 thomas return err;
7973 10604dce 2021-09-24 thomas const struct got_error *
7974 10604dce 2021-09-24 thomas got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7975 10604dce 2021-09-24 thomas struct got_repository *repo)
7977 10604dce 2021-09-24 thomas const struct got_error *err;
7978 10604dce 2021-09-24 thomas char *branch_refname = NULL;
7979 10604dce 2021-09-24 thomas struct got_reference *branch_ref = NULL;
7981 10604dce 2021-09-24 thomas *in_progress = 0;
7983 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
7984 10604dce 2021-09-24 thomas if (err)
7985 10604dce 2021-09-24 thomas return err;
7986 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7987 dfe86d1f 2021-09-24 thomas free(branch_refname);
7988 10604dce 2021-09-24 thomas if (err) {
7989 10604dce 2021-09-24 thomas if (err->code != GOT_ERR_NOT_REF)
7990 10604dce 2021-09-24 thomas return err;
7992 10604dce 2021-09-24 thomas *in_progress = 1;
7994 10604dce 2021-09-24 thomas return NULL;
7997 10604dce 2021-09-24 thomas const struct got_error *got_worktree_merge_prepare(
7998 10604dce 2021-09-24 thomas struct got_fileindex **fileindex, struct got_worktree *worktree,
7999 10604dce 2021-09-24 thomas struct got_reference *branch, struct got_repository *repo)
8001 10604dce 2021-09-24 thomas const struct got_error *err = NULL;
8002 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
8003 10604dce 2021-09-24 thomas char *branch_refname = NULL, *commit_refname = NULL;
8004 10604dce 2021-09-24 thomas struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8005 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL;
8006 10604dce 2021-09-24 thomas struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8007 10604dce 2021-09-24 thomas struct check_rebase_ok_arg ok_arg;
8009 10604dce 2021-09-24 thomas *fileindex = NULL;
8011 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
8012 10604dce 2021-09-24 thomas if (err)
8013 10604dce 2021-09-24 thomas return err;
8015 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
8016 10604dce 2021-09-24 thomas if (err)
8017 10604dce 2021-09-24 thomas goto done;
8019 10604dce 2021-09-24 thomas /* Preconditions are the same as for rebase. */
8020 10604dce 2021-09-24 thomas ok_arg.worktree = worktree;
8021 10604dce 2021-09-24 thomas ok_arg.repo = repo;
8022 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8023 10604dce 2021-09-24 thomas &ok_arg);
8024 10604dce 2021-09-24 thomas if (err)
8025 10604dce 2021-09-24 thomas goto done;
8027 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
8028 10604dce 2021-09-24 thomas if (err)
8029 10604dce 2021-09-24 thomas return err;
8031 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
8032 10604dce 2021-09-24 thomas if (err)
8033 10604dce 2021-09-24 thomas return err;
8035 10604dce 2021-09-24 thomas err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8037 10604dce 2021-09-24 thomas if (err)
8038 10604dce 2021-09-24 thomas goto done;
8040 10604dce 2021-09-24 thomas err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8041 10604dce 2021-09-24 thomas if (err)
8042 10604dce 2021-09-24 thomas goto done;
8044 10604dce 2021-09-24 thomas if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8045 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8046 10604dce 2021-09-24 thomas goto done;
8049 10604dce 2021-09-24 thomas err = got_ref_resolve(&branch_tip, repo, branch);
8050 10604dce 2021-09-24 thomas if (err)
8051 10604dce 2021-09-24 thomas goto done;
8053 10604dce 2021-09-24 thomas err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8054 10604dce 2021-09-24 thomas if (err)
8055 10604dce 2021-09-24 thomas goto done;
8056 10604dce 2021-09-24 thomas err = got_ref_write(branch_ref, repo);
8057 10604dce 2021-09-24 thomas if (err)
8058 10604dce 2021-09-24 thomas goto done;
8060 10604dce 2021-09-24 thomas err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8061 10604dce 2021-09-24 thomas if (err)
8062 10604dce 2021-09-24 thomas goto done;
8063 10604dce 2021-09-24 thomas err = got_ref_write(commit_ref, repo);
8064 10604dce 2021-09-24 thomas if (err)
8065 10604dce 2021-09-24 thomas goto done;
8068 10604dce 2021-09-24 thomas free(branch_refname);
8069 10604dce 2021-09-24 thomas free(commit_refname);
8070 10604dce 2021-09-24 thomas free(fileindex_path);
8071 10604dce 2021-09-24 thomas if (branch_ref)
8072 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
8073 10604dce 2021-09-24 thomas if (commit_ref)
8074 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
8075 10604dce 2021-09-24 thomas if (wt_branch)
8076 10604dce 2021-09-24 thomas got_ref_close(wt_branch);
8077 10604dce 2021-09-24 thomas free(wt_branch_tip);
8078 10604dce 2021-09-24 thomas if (err) {
8079 10604dce 2021-09-24 thomas if (*fileindex) {
8080 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
8081 10604dce 2021-09-24 thomas *fileindex = NULL;
8083 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
8085 10604dce 2021-09-24 thomas return err;
8088 10604dce 2021-09-24 thomas const struct got_error *
8089 10604dce 2021-09-24 thomas got_worktree_merge_continue(char **branch_name,
8090 10604dce 2021-09-24 thomas struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8091 10604dce 2021-09-24 thomas struct got_worktree *worktree, struct got_repository *repo)
8093 10604dce 2021-09-24 thomas const struct got_error *err;
8094 10604dce 2021-09-24 thomas char *commit_refname = NULL, *branch_refname = NULL;
8095 10604dce 2021-09-24 thomas struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8096 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
8097 10604dce 2021-09-24 thomas int have_staged_files = 0;
8099 10604dce 2021-09-24 thomas *branch_name = NULL;
8100 10604dce 2021-09-24 thomas *branch_tip = NULL;
8101 10604dce 2021-09-24 thomas *fileindex = NULL;
8103 10604dce 2021-09-24 thomas err = lock_worktree(worktree, LOCK_EX);
8104 10604dce 2021-09-24 thomas if (err)
8105 10604dce 2021-09-24 thomas return err;
8107 10604dce 2021-09-24 thomas err = open_fileindex(fileindex, &fileindex_path, worktree);
8108 10604dce 2021-09-24 thomas if (err)
8109 10604dce 2021-09-24 thomas goto done;
8111 10604dce 2021-09-24 thomas err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8112 10604dce 2021-09-24 thomas &have_staged_files);
8113 10604dce 2021-09-24 thomas if (err && err->code != GOT_ERR_CANCELLED)
8114 10604dce 2021-09-24 thomas goto done;
8115 10604dce 2021-09-24 thomas if (have_staged_files) {
8116 10604dce 2021-09-24 thomas err = got_error(GOT_ERR_STAGED_PATHS);
8117 10604dce 2021-09-24 thomas goto done;
8120 10604dce 2021-09-24 thomas err = get_merge_branch_ref_name(&branch_refname, worktree);
8121 10604dce 2021-09-24 thomas if (err)
8122 10604dce 2021-09-24 thomas goto done;
8124 10604dce 2021-09-24 thomas err = get_merge_commit_ref_name(&commit_refname, worktree);
8125 10604dce 2021-09-24 thomas if (err)
8126 10604dce 2021-09-24 thomas goto done;
8128 10604dce 2021-09-24 thomas err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8129 10604dce 2021-09-24 thomas if (err)
8130 10604dce 2021-09-24 thomas goto done;
8132 10604dce 2021-09-24 thomas if (!got_ref_is_symbolic(branch_ref)) {
8133 10604dce 2021-09-24 thomas err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8134 10604dce 2021-09-24 thomas "%s is not a symbolic reference",
8135 10604dce 2021-09-24 thomas got_ref_get_name(branch_ref));
8136 10604dce 2021-09-24 thomas goto done;
8138 10604dce 2021-09-24 thomas *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8139 10604dce 2021-09-24 thomas if (*branch_name == NULL) {
8140 10604dce 2021-09-24 thomas err = got_error_from_errno("strdup");
8141 10604dce 2021-09-24 thomas goto done;
8144 10604dce 2021-09-24 thomas err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8145 10604dce 2021-09-24 thomas if (err)
8146 10604dce 2021-09-24 thomas goto done;
8148 10604dce 2021-09-24 thomas err = got_ref_resolve(branch_tip, repo, commit_ref);
8149 10604dce 2021-09-24 thomas if (err)
8150 10604dce 2021-09-24 thomas goto done;
8152 10604dce 2021-09-24 thomas free(commit_refname);
8153 10604dce 2021-09-24 thomas free(branch_refname);
8154 10604dce 2021-09-24 thomas free(fileindex_path);
8155 10604dce 2021-09-24 thomas if (commit_ref)
8156 10604dce 2021-09-24 thomas got_ref_close(commit_ref);
8157 10604dce 2021-09-24 thomas if (branch_ref)
8158 10604dce 2021-09-24 thomas got_ref_close(branch_ref);
8159 10604dce 2021-09-24 thomas if (err) {
8160 10604dce 2021-09-24 thomas if (*branch_name) {
8161 10604dce 2021-09-24 thomas free(*branch_name);
8162 10604dce 2021-09-24 thomas *branch_name = NULL;
8164 10604dce 2021-09-24 thomas free(*branch_tip);
8165 10604dce 2021-09-24 thomas *branch_tip = NULL;
8166 10604dce 2021-09-24 thomas if (*fileindex) {
8167 10604dce 2021-09-24 thomas got_fileindex_free(*fileindex);
8168 10604dce 2021-09-24 thomas *fileindex = NULL;
8170 10604dce 2021-09-24 thomas lock_worktree(worktree, LOCK_SH);
8172 10604dce 2021-09-24 thomas return err;
8175 10604dce 2021-09-24 thomas const struct got_error *
8176 10604dce 2021-09-24 thomas got_worktree_merge_abort(struct got_worktree *worktree,
8177 10604dce 2021-09-24 thomas struct got_fileindex *fileindex, struct got_repository *repo,
8178 10604dce 2021-09-24 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
8180 10604dce 2021-09-24 thomas const struct got_error *err, *unlockerr, *sync_err;
8181 10604dce 2021-09-24 thomas struct got_object_id *commit_id = NULL;
8182 945f9229 2022-04-16 thomas struct got_commit_object *commit = NULL;
8183 10604dce 2021-09-24 thomas char *fileindex_path = NULL;
8184 10604dce 2021-09-24 thomas struct revert_file_args rfa;
8185 10604dce 2021-09-24 thomas struct got_object_id *tree_id = NULL;
8187 945f9229 2022-04-16 thomas err = got_object_open_as_commit(&commit, repo,
8188 945f9229 2022-04-16 thomas worktree->base_commit_id);
8189 945f9229 2022-04-16 thomas if (err)
8190 945f9229 2022-04-16 thomas goto done;
8192 945f9229 2022-04-16 thomas err = got_object_id_by_path(&tree_id, repo, commit,
8193 945f9229 2022-04-16 thomas worktree->path_prefix);
8194 10604dce 2021-09-24 thomas if (err)
8195 10604dce 2021-09-24 thomas goto done;
8197 10604dce 2021-09-24 thomas err = delete_merge_refs(worktree, repo);
8198 10604dce 2021-09-24 thomas if (err)
8199 10604dce 2021-09-24 thomas goto done;
8201 10604dce 2021-09-24 thomas err = get_fileindex_path(&fileindex_path, worktree);
8202 10604dce 2021-09-24 thomas if (err)
8203 10604dce 2021-09-24 thomas goto done;
8205 10604dce 2021-09-24 thomas rfa.worktree = worktree;
8206 10604dce 2021-09-24 thomas rfa.fileindex = fileindex;
8207 10604dce 2021-09-24 thomas rfa.progress_cb = progress_cb;
8208 10604dce 2021-09-24 thomas rfa.progress_arg = progress_arg;
8209 10604dce 2021-09-24 thomas rfa.patch_cb = NULL;
8210 10604dce 2021-09-24 thomas rfa.patch_arg = NULL;
8211 10604dce 2021-09-24 thomas rfa.repo = repo;
8212 10604dce 2021-09-24 thomas rfa.unlink_added_files = 1;
8213 10604dce 2021-09-24 thomas err = worktree_status(worktree, "", fileindex, repo,
8214 6092c299 2021-10-04 thomas revert_file, &rfa, NULL, NULL, 1, 0);
8215 10604dce 2021-09-24 thomas if (err)
8216 10604dce 2021-09-24 thomas goto sync;
8218 10604dce 2021-09-24 thomas err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8219 10604dce 2021-09-24 thomas repo, progress_cb, progress_arg, NULL, NULL);
8221 10604dce 2021-09-24 thomas sync_err = sync_fileindex(fileindex, fileindex_path);
8222 10604dce 2021-09-24 thomas if (sync_err && err == NULL)
8223 10604dce 2021-09-24 thomas err = sync_err;
8225 10604dce 2021-09-24 thomas free(tree_id);
8226 10604dce 2021-09-24 thomas free(commit_id);
8227 945f9229 2022-04-16 thomas if (commit)
8228 945f9229 2022-04-16 thomas got_object_commit_close(commit);
8229 10604dce 2021-09-24 thomas if (fileindex)
8230 10604dce 2021-09-24 thomas got_fileindex_free(fileindex);
8231 10604dce 2021-09-24 thomas free(fileindex_path);
8233 10604dce 2021-09-24 thomas unlockerr = lock_worktree(worktree, LOCK_SH);
8234 10604dce 2021-09-24 thomas if (unlockerr && err == NULL)
8235 10604dce 2021-09-24 thomas err = unlockerr;
8236 10604dce 2021-09-24 thomas return err;
8239 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
8240 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
8241 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8242 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8243 2db2652d 2019-08-07 stsp struct got_repository *repo;
8244 2db2652d 2019-08-07 stsp int have_changes;
8247 ef20f542 2022-06-26 thomas static const struct got_error *
8248 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
8249 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8250 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8251 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8253 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
8254 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
8255 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
8256 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
8257 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
8258 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
8260 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
8261 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
8262 8b13ce36 2019-08-08 stsp return NULL;
8263 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
8264 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
8266 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8267 735ef5ac 2019-08-03 stsp if (ie == NULL)
8268 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8270 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8271 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8272 735ef5ac 2019-08-03 stsp relpath) == -1)
8273 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
8275 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
8276 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
8277 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8278 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
8281 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
8282 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8283 3aa5969e 2019-08-06 stsp goto done;
8284 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
8285 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
8286 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
8287 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8288 735ef5ac 2019-08-03 stsp goto done;
8291 2db2652d 2019-08-07 stsp a->have_changes = 1;
8293 735ef5ac 2019-08-03 stsp p = in_repo_path;
8294 735ef5ac 2019-08-03 stsp while (p[0] == '/')
8296 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
8297 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
8298 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
8300 735ef5ac 2019-08-03 stsp free(in_repo_path);
8301 dc424a06 2019-08-07 stsp return err;
8304 2db2652d 2019-08-07 stsp struct stage_path_arg {
8305 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
8306 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
8307 2db2652d 2019-08-07 stsp struct got_repository *repo;
8308 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
8309 2db2652d 2019-08-07 stsp void *status_arg;
8310 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
8311 2db2652d 2019-08-07 stsp void *patch_arg;
8312 7b5dc508 2019-10-28 stsp int staged_something;
8313 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
8316 2db2652d 2019-08-07 stsp static const struct got_error *
8317 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
8318 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
8319 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8320 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8322 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8323 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8324 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8325 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8326 0cb83759 2019-08-03 stsp uint32_t stage;
8327 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8328 0aeb8099 2020-07-23 stsp struct stat sb;
8330 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8331 8b13ce36 2019-08-08 stsp return NULL;
8333 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8334 d3e7c587 2019-08-03 stsp if (ie == NULL)
8335 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8337 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8338 2db2652d 2019-08-07 stsp relpath)== -1)
8339 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8341 0cb83759 2019-08-03 stsp switch (status) {
8342 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8343 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8344 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8345 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8346 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8349 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8350 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8351 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8352 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8353 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8356 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8359 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8360 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8361 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8362 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8363 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8367 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8368 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8371 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8372 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8373 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8374 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8376 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8377 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8378 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8379 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8380 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8381 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8382 35213c7c 2020-07-23 stsp ssize_t target_len;
8383 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8384 35213c7c 2020-07-23 stsp sizeof(target_path));
8385 35213c7c 2020-07-23 stsp if (target_len == -1) {
8386 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8387 35213c7c 2020-07-23 stsp ondisk_path);
8390 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8391 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8392 35213c7c 2020-07-23 stsp a->worktree->root_path);
8395 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8396 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8397 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8401 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8402 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8403 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8405 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8406 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8408 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8409 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8411 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8412 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8414 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8415 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8416 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8417 f289c82c 2022-06-13 thomas if (err)
8420 f289c82c 2022-06-13 thomas * When staging the reverse of the staged diff,
8421 f289c82c 2022-06-13 thomas * implicitly unstage the file.
8423 f289c82c 2022-06-13 thomas if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8424 f289c82c 2022-06-13 thomas sizeof(ie->blob_sha1)) == 0) {
8425 f289c82c 2022-06-13 thomas got_fileindex_entry_stage_set(ie,
8426 f289c82c 2022-06-13 thomas GOT_FILEIDX_STAGE_NONE);
8429 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8430 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8432 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8433 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8434 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8435 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8438 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8440 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8441 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8445 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8446 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8447 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8448 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8450 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8451 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8454 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8456 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8457 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8459 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8460 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8463 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8467 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8468 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8469 dc424a06 2019-08-07 stsp free(path_content);
8470 2db2652d 2019-08-07 stsp free(ondisk_path);
8471 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8472 0ebf8283 2019-07-24 stsp return err;
8475 0cb83759 2019-08-03 stsp const struct got_error *
8476 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8477 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8478 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8479 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8480 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8482 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8483 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8484 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8485 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8486 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8487 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8488 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8489 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8491 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8493 0cb83759 2019-08-03 stsp return err;
8495 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8496 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8498 735ef5ac 2019-08-03 stsp goto done;
8499 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8501 735ef5ac 2019-08-03 stsp goto done;
8502 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8504 0cb83759 2019-08-03 stsp goto done;
8506 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8507 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8508 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8509 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8510 2db2652d 2019-08-07 stsp oka.repo = repo;
8511 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8512 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8513 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8514 6092c299 2021-10-04 thomas check_stage_ok, &oka, NULL, NULL, 1, 0);
8516 735ef5ac 2019-08-03 stsp goto done;
8518 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8519 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8520 2db2652d 2019-08-07 stsp goto done;
8523 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8524 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8525 2db2652d 2019-08-07 stsp spa.repo = repo;
8526 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8527 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8528 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8529 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8530 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8531 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8532 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8533 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8534 6092c299 2021-10-04 thomas stage_path, &spa, NULL, NULL, 1, 0);
8536 2db2652d 2019-08-07 stsp goto done;
8538 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8539 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8540 7b5dc508 2019-10-28 stsp goto done;
8543 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8544 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8545 0cb83759 2019-08-03 stsp err = sync_err;
8547 735ef5ac 2019-08-03 stsp if (head_ref)
8548 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8549 735ef5ac 2019-08-03 stsp free(head_commit_id);
8550 0cb83759 2019-08-03 stsp free(fileindex_path);
8551 0cb83759 2019-08-03 stsp if (fileindex)
8552 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8553 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8554 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8555 0cb83759 2019-08-03 stsp err = unlockerr;
8556 0cb83759 2019-08-03 stsp return err;
8559 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8560 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8561 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8562 ad493afc 2019-08-03 stsp struct got_repository *repo;
8563 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8564 ad493afc 2019-08-03 stsp void *progress_arg;
8565 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8566 2e1f37b0 2019-08-08 stsp void *patch_arg;
8569 2e1f37b0 2019-08-08 stsp static const struct got_error *
8570 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8571 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8572 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8573 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8574 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8576 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8577 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8578 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8579 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8580 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8581 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8582 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8583 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
8585 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8586 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8588 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8590 2e1f37b0 2019-08-08 stsp return err;
8592 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
8593 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
8594 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8595 f4ae6ddb 2022-07-01 thomas goto done;
8597 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
8598 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
8599 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8600 f4ae6ddb 2022-07-01 thomas goto done;
8603 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8605 2e1f37b0 2019-08-08 stsp goto done;
8607 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8609 2e1f37b0 2019-08-08 stsp goto done;
8611 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8613 2e1f37b0 2019-08-08 stsp goto done;
8615 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8618 2e1f37b0 2019-08-08 stsp goto done;
8620 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8622 2e1f37b0 2019-08-08 stsp goto done;
8624 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8626 2e1f37b0 2019-08-08 stsp goto done;
8628 dd2e2f52 2022-07-01 thomas err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8629 25ec7006 2022-07-01 thomas path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8631 2e1f37b0 2019-08-08 stsp goto done;
8633 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8634 fc2a50f2 2022-11-01 thomas "got-unstaged-content", "");
8636 2e1f37b0 2019-08-08 stsp goto done;
8637 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8638 fc2a50f2 2022-11-01 thomas "got-new-staged-content", "");
8640 2e1f37b0 2019-08-08 stsp goto done;
8642 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8643 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8644 2e1f37b0 2019-08-08 stsp goto done;
8646 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8647 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8648 2e1f37b0 2019-08-08 stsp goto done;
8650 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8651 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8652 f4ae6ddb 2022-07-01 thomas struct diff_chunk_context cc = {};
8653 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8654 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8655 fe621944 2020-11-10 stsp nchanges++;
8657 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8658 2e1f37b0 2019-08-08 stsp int choice;
8659 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8660 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8661 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8662 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8664 2e1f37b0 2019-08-08 stsp goto done;
8665 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8666 2e1f37b0 2019-08-08 stsp have_content = 1;
8668 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8669 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8672 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8673 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8674 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8676 2e1f37b0 2019-08-08 stsp free(label1);
8677 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8678 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8680 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8681 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8682 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
8683 2e1f37b0 2019-08-08 stsp if (staged_blob)
8684 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8685 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8686 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8687 fe621944 2020-11-10 stsp err = free_err;
8688 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8689 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8690 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8691 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8692 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8693 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8694 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8695 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8696 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8697 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8698 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8699 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8700 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8701 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8702 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8703 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8704 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8705 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8706 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8708 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8709 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8710 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8711 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8712 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8713 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8714 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8716 2e1f37b0 2019-08-08 stsp free(path1);
8717 2e1f37b0 2019-08-08 stsp free(path2);
8718 fda8017d 2020-07-23 stsp return err;
8721 fda8017d 2020-07-23 stsp static const struct got_error *
8722 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8723 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8724 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8725 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8726 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8727 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8728 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8730 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8731 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8732 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8733 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8734 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8735 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8736 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8737 fda8017d 2020-07-23 stsp struct stat sb;
8739 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8740 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8741 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8743 fda8017d 2020-07-23 stsp return err;
8745 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8746 fda8017d 2020-07-23 stsp return NULL;
8748 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8749 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8750 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8752 fda8017d 2020-07-23 stsp goto done;
8755 c56c5d8a 2021-12-31 thomas f = fopen(path_unstaged_content, "re");
8756 fda8017d 2020-07-23 stsp if (f == NULL) {
8757 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8758 fda8017d 2020-07-23 stsp path_unstaged_content);
8759 fda8017d 2020-07-23 stsp goto done;
8761 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8762 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8763 fda8017d 2020-07-23 stsp goto done;
8765 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8766 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8767 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8769 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8770 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8771 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8772 fda8017d 2020-07-23 stsp goto done;
8774 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8775 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8776 fda8017d 2020-07-23 stsp goto done;
8778 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8779 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8780 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8781 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8782 fda8017d 2020-07-23 stsp progress_arg);
8784 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8786 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8788 67a66647 2021-05-31 stsp return err;
8790 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8791 67a66647 2021-05-31 stsp parent) == -1) {
8792 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8793 67a66647 2021-05-31 stsp base_path = NULL;
8794 67a66647 2021-05-31 stsp goto done;
8797 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&blob_base_path, &f_base,
8798 fc2a50f2 2022-11-01 thomas base_path, "");
8800 67a66647 2021-05-31 stsp goto done;
8801 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8802 67a66647 2021-05-31 stsp blob_base);
8804 67a66647 2021-05-31 stsp goto done;
8807 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8808 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8810 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8811 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8812 eec2f5a9 2021-06-03 stsp ondisk_path);
8814 eec2f5a9 2021-06-03 stsp goto done;
8817 06340621 2021-12-31 thomas fd = open(ondisk_path,
8818 06340621 2021-12-31 thomas O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8819 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8820 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8821 eec2f5a9 2021-06-03 stsp goto done;
8823 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8824 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8825 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8826 eec2f5a9 2021-06-03 stsp close(fd);
8827 eec2f5a9 2021-06-03 stsp goto done;
8831 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8832 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8833 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8834 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8835 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8838 fda8017d 2020-07-23 stsp goto done;
8840 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8841 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8842 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8844 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8845 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8848 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8849 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8850 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8851 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8852 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8853 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8854 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8855 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8856 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8857 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8858 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8859 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8860 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8861 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8862 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8863 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8864 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8865 67a66647 2021-05-31 stsp free(blob_base_path);
8866 67a66647 2021-05-31 stsp free(parent);
8867 67a66647 2021-05-31 stsp free(base_path);
8868 2e1f37b0 2019-08-08 stsp return err;
8871 ad493afc 2019-08-03 stsp static const struct got_error *
8872 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8873 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8874 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8875 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8877 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8878 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8879 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8880 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8881 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8882 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8883 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8884 9bc94a15 2019-08-03 stsp struct stat sb;
8885 f4ae6ddb 2022-07-01 thomas int fd1 = -1, fd2 = -1;
8887 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8888 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8889 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8890 2e1f37b0 2019-08-08 stsp return NULL;
8892 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8893 ad493afc 2019-08-03 stsp if (ie == NULL)
8894 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8896 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8898 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8900 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8901 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8903 f69721c3 2019-10-21 stsp goto done;
8904 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8905 f69721c3 2019-10-21 stsp id_str) == -1) {
8906 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8907 f4ae6ddb 2022-07-01 thomas goto done;
8910 f4ae6ddb 2022-07-01 thomas fd1 = got_opentempfd();
8911 f4ae6ddb 2022-07-01 thomas if (fd1 == -1) {
8912 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8913 f4ae6ddb 2022-07-01 thomas goto done;
8915 f4ae6ddb 2022-07-01 thomas fd2 = got_opentempfd();
8916 f4ae6ddb 2022-07-01 thomas if (fd2 == -1) {
8917 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
8918 f69721c3 2019-10-21 stsp goto done;
8921 ad493afc 2019-08-03 stsp switch (staged_status) {
8922 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8923 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8924 f4ae6ddb 2022-07-01 thomas blob_id, 8192, fd1);
8927 ad493afc 2019-08-03 stsp /* fall through */
8928 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8929 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8930 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8931 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8932 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8933 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8936 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8939 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8940 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8941 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8942 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8943 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8944 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8947 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8948 f4ae6ddb 2022-07-01 thomas staged_blob_id, 8192, fd2);
8951 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8952 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8953 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8954 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8955 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8956 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8957 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8958 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8959 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8961 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8962 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8963 36bf999c 2020-07-23 stsp char *staged_target;
8964 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8965 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8967 36bf999c 2020-07-23 stsp goto done;
8968 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8969 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8970 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8971 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8972 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8973 36bf999c 2020-07-23 stsp free(staged_target);
8975 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8976 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8977 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8978 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8979 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8980 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8981 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8985 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8988 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8989 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8990 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8991 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8994 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8995 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8996 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8997 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8998 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
9001 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
9003 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
9004 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
9008 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9009 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
9010 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
9011 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
9014 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
9018 ad493afc 2019-08-03 stsp free(ondisk_path);
9019 f4ae6ddb 2022-07-01 thomas if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9020 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
9021 ad493afc 2019-08-03 stsp if (blob_base)
9022 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
9023 f4ae6ddb 2022-07-01 thomas if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9024 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
9025 ad493afc 2019-08-03 stsp if (blob_staged)
9026 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
9027 f69721c3 2019-10-21 stsp free(id_str);
9028 f69721c3 2019-10-21 stsp free(label_orig);
9029 ad493afc 2019-08-03 stsp return err;
9032 ad493afc 2019-08-03 stsp const struct got_error *
9033 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
9034 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
9035 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
9036 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
9037 ad493afc 2019-08-03 stsp struct got_repository *repo)
9039 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
9040 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
9041 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
9042 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
9043 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
9045 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
9047 ad493afc 2019-08-03 stsp return err;
9049 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9051 ad493afc 2019-08-03 stsp goto done;
9053 ad493afc 2019-08-03 stsp upa.worktree = worktree;
9054 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
9055 ad493afc 2019-08-03 stsp upa.repo = repo;
9056 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
9057 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
9058 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
9059 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
9060 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
9061 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
9062 6092c299 2021-10-04 thomas unstage_path, &upa, NULL, NULL, 1, 0);
9064 ad493afc 2019-08-03 stsp goto done;
9067 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
9068 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
9069 ad493afc 2019-08-03 stsp err = sync_err;
9071 ad493afc 2019-08-03 stsp free(fileindex_path);
9072 ad493afc 2019-08-03 stsp if (fileindex)
9073 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
9074 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
9075 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
9076 ad493afc 2019-08-03 stsp err = unlockerr;
9077 ad493afc 2019-08-03 stsp return err;
9080 b2118c49 2020-07-28 stsp struct report_file_info_arg {
9081 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
9082 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
9083 b2118c49 2020-07-28 stsp void *info_arg;
9084 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
9085 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
9086 b2118c49 2020-07-28 stsp void *cancel_arg;
9089 b2118c49 2020-07-28 stsp static const struct got_error *
9090 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
9092 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
9093 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
9094 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
9095 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9096 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
9097 b2118c49 2020-07-28 stsp int stage;
9099 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9100 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
9102 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
9103 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9104 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
9107 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
9108 b2118c49 2020-07-28 stsp return NULL;
9110 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
9111 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
9112 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
9114 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
9115 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9116 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
9117 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
9118 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
9119 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
9122 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
9123 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
9124 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
9127 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9128 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9131 b2118c49 2020-07-28 stsp const struct got_error *
9132 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
9133 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
9134 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
9135 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
9138 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
9139 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
9140 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
9141 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
9143 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
9145 b2118c49 2020-07-28 stsp return err;
9147 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
9149 b2118c49 2020-07-28 stsp goto done;
9151 b2118c49 2020-07-28 stsp arg.worktree = worktree;
9152 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
9153 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
9154 b2118c49 2020-07-28 stsp arg.paths = paths;
9155 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
9156 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
9157 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9160 b2118c49 2020-07-28 stsp free(fileindex_path);
9161 b2118c49 2020-07-28 stsp if (fileindex)
9162 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
9163 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
9164 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
9165 b2118c49 2020-07-28 stsp err = unlockerr;
9166 b2118c49 2020-07-28 stsp return err;
9169 814624e7 2022-03-22 thomas static const struct got_error *
9170 814624e7 2022-03-22 thomas patch_check_path(const char *p, char **path, unsigned char *status,
9171 814624e7 2022-03-22 thomas unsigned char *staged_status, struct got_fileindex *fileindex,
9172 814624e7 2022-03-22 thomas struct got_worktree *worktree, struct got_repository *repo)
9174 814624e7 2022-03-22 thomas const struct got_error *err;
9175 814624e7 2022-03-22 thomas struct got_fileindex_entry *ie;
9176 814624e7 2022-03-22 thomas struct stat sb;
9177 814624e7 2022-03-22 thomas char *ondisk_path = NULL;
9179 814624e7 2022-03-22 thomas err = got_worktree_resolve_path(path, worktree, p);
9180 814624e7 2022-03-22 thomas if (err)
9181 814624e7 2022-03-22 thomas return err;
9183 814624e7 2022-03-22 thomas if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9184 814624e7 2022-03-22 thomas *path[0] ? "/" : "", *path) == -1)
9185 814624e7 2022-03-22 thomas return got_error_from_errno("asprintf");
9187 814624e7 2022-03-22 thomas ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9188 814624e7 2022-03-22 thomas if (ie) {
9189 814624e7 2022-03-22 thomas *staged_status = get_staged_status(ie);
9190 12de5570 2022-05-01 thomas err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9192 814624e7 2022-03-22 thomas if (err)
9193 814624e7 2022-03-22 thomas goto done;
9194 814624e7 2022-03-22 thomas } else {
9195 814624e7 2022-03-22 thomas *staged_status = GOT_STATUS_NO_CHANGE;
9196 814624e7 2022-03-22 thomas *status = GOT_STATUS_UNVERSIONED;
9197 814624e7 2022-03-22 thomas if (lstat(ondisk_path, &sb) == -1) {
9198 814624e7 2022-03-22 thomas if (errno != ENOENT) {
9199 814624e7 2022-03-22 thomas err = got_error_from_errno2("lstat",
9200 814624e7 2022-03-22 thomas ondisk_path);
9201 814624e7 2022-03-22 thomas goto done;
9203 814624e7 2022-03-22 thomas *status = GOT_STATUS_NONEXISTENT;
9208 814624e7 2022-03-22 thomas free(ondisk_path);
9209 814624e7 2022-03-22 thomas return err;
9212 814624e7 2022-03-22 thomas static const struct got_error *
9213 814624e7 2022-03-22 thomas patch_can_rm(const char *path, unsigned char status,
9214 814624e7 2022-03-22 thomas unsigned char staged_status)
9216 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
9217 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
9218 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
9219 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
9220 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY &&
9221 814624e7 2022-03-22 thomas status != GOT_STATUS_MODE_CHANGE)
9222 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9223 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
9224 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9225 814624e7 2022-03-22 thomas return NULL;
9228 814624e7 2022-03-22 thomas static const struct got_error *
9229 814624e7 2022-03-22 thomas patch_can_add(const char *path, unsigned char status)
9231 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NONEXISTENT)
9232 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9233 814624e7 2022-03-22 thomas return NULL;
9236 814624e7 2022-03-22 thomas static const struct got_error *
9237 814624e7 2022-03-22 thomas patch_can_edit(const char *path, unsigned char status,
9238 814624e7 2022-03-22 thomas unsigned char staged_status)
9240 814624e7 2022-03-22 thomas if (status == GOT_STATUS_NONEXISTENT)
9241 814624e7 2022-03-22 thomas return got_error_set_errno(ENOENT, path);
9242 814624e7 2022-03-22 thomas if (status != GOT_STATUS_NO_CHANGE &&
9243 814624e7 2022-03-22 thomas status != GOT_STATUS_ADD &&
9244 814624e7 2022-03-22 thomas status != GOT_STATUS_MODIFY)
9245 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9246 814624e7 2022-03-22 thomas if (staged_status == GOT_STATUS_DELETE)
9247 814624e7 2022-03-22 thomas return got_error_path(path, GOT_ERR_FILE_STATUS);
9248 814624e7 2022-03-22 thomas return NULL;
9251 814624e7 2022-03-22 thomas const struct got_error *
9252 814624e7 2022-03-22 thomas got_worktree_patch_prepare(struct got_fileindex **fileindex,
9253 5e22b737 2022-05-31 thomas char **fileindex_path, struct got_worktree *worktree)
9255 5e22b737 2022-05-31 thomas return open_fileindex(fileindex, fileindex_path, worktree);
9258 814624e7 2022-03-22 thomas const struct got_error *
9259 814624e7 2022-03-22 thomas got_worktree_patch_check_path(const char *old, const char *new,
9260 814624e7 2022-03-22 thomas char **oldpath, char **newpath, struct got_worktree *worktree,
9261 814624e7 2022-03-22 thomas struct got_repository *repo, struct got_fileindex *fileindex)
9263 814624e7 2022-03-22 thomas const struct got_error *err = NULL;
9264 814624e7 2022-03-22 thomas int file_renamed = 0;
9265 814624e7 2022-03-22 thomas unsigned char status_old, staged_status_old;
9266 814624e7 2022-03-22 thomas unsigned char status_new, staged_status_new;
9268 814624e7 2022-03-22 thomas *oldpath = NULL;
9269 814624e7 2022-03-22 thomas *newpath = NULL;
9271 814624e7 2022-03-22 thomas err = patch_check_path(old != NULL ? old : new, oldpath,
9272 814624e7 2022-03-22 thomas &status_old, &staged_status_old, fileindex, worktree, repo);
9273 814624e7 2022-03-22 thomas if (err)
9274 814624e7 2022-03-22 thomas goto done;
9276 814624e7 2022-03-22 thomas err = patch_check_path(new != NULL ? new : old, newpath,
9277 814624e7 2022-03-22 thomas &status_new, &staged_status_new, fileindex, worktree, repo);
9278 814624e7 2022-03-22 thomas if (err)
9279 814624e7 2022-03-22 thomas goto done;
9281 814624e7 2022-03-22 thomas if (old != NULL && new != NULL && strcmp(old, new) != 0)
9282 814624e7 2022-03-22 thomas file_renamed = 1;
9284 814624e7 2022-03-22 thomas if (old != NULL && new == NULL)
9285 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
9286 814624e7 2022-03-22 thomas else if (file_renamed) {
9287 814624e7 2022-03-22 thomas err = patch_can_rm(*oldpath, status_old, staged_status_old);
9288 814624e7 2022-03-22 thomas if (err == NULL)
9289 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
9290 814624e7 2022-03-22 thomas } else if (old == NULL)
9291 814624e7 2022-03-22 thomas err = patch_can_add(*newpath, status_new);
9293 814624e7 2022-03-22 thomas err = patch_can_edit(*newpath, status_new, staged_status_new);
9296 814624e7 2022-03-22 thomas if (err) {
9297 814624e7 2022-03-22 thomas free(*oldpath);
9298 814624e7 2022-03-22 thomas *oldpath = NULL;
9299 814624e7 2022-03-22 thomas free(*newpath);
9300 814624e7 2022-03-22 thomas *newpath = NULL;
9302 814624e7 2022-03-22 thomas return err;
9305 814624e7 2022-03-22 thomas const struct got_error *
9306 5e22b737 2022-05-31 thomas got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9307 5e22b737 2022-05-31 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
9308 5e22b737 2022-05-31 thomas got_worktree_checkout_cb progress_cb, void *progress_arg)
9310 5e22b737 2022-05-31 thomas struct schedule_addition_args saa;
9312 5e22b737 2022-05-31 thomas memset(&saa, 0, sizeof(saa));
9313 5e22b737 2022-05-31 thomas saa.worktree = worktree;
9314 5e22b737 2022-05-31 thomas saa.fileindex = fileindex;
9315 5e22b737 2022-05-31 thomas saa.progress_cb = progress_cb;
9316 5e22b737 2022-05-31 thomas saa.progress_arg = progress_arg;
9317 5e22b737 2022-05-31 thomas saa.repo = repo;
9319 5e22b737 2022-05-31 thomas return worktree_status(worktree, path, fileindex, repo,
9320 5e22b737 2022-05-31 thomas schedule_addition, &saa, NULL, NULL, 1, 0);
9323 5e22b737 2022-05-31 thomas const struct got_error *
9324 5e22b737 2022-05-31 thomas got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9325 5e22b737 2022-05-31 thomas struct got_worktree *worktree, struct got_fileindex *fileindex,
9326 5e22b737 2022-05-31 thomas got_worktree_delete_cb progress_cb, void *progress_arg)
9328 5e22b737 2022-05-31 thomas struct schedule_deletion_args sda;
9330 5e22b737 2022-05-31 thomas memset(&sda, 0, sizeof(sda));
9331 5e22b737 2022-05-31 thomas sda.worktree = worktree;
9332 5e22b737 2022-05-31 thomas sda.fileindex = fileindex;
9333 5e22b737 2022-05-31 thomas sda.progress_cb = progress_cb;
9334 5e22b737 2022-05-31 thomas sda.progress_arg = progress_arg;
9335 5e22b737 2022-05-31 thomas sda.repo = repo;
9336 5e22b737 2022-05-31 thomas sda.delete_local_mods = 0;
9337 5e22b737 2022-05-31 thomas sda.keep_on_disk = 0;
9338 5e22b737 2022-05-31 thomas sda.ignore_missing_paths = 0;
9339 5e22b737 2022-05-31 thomas sda.status_codes = NULL;
9341 5e22b737 2022-05-31 thomas return worktree_status(worktree, path, fileindex, repo,
9342 5e22b737 2022-05-31 thomas schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9345 5e22b737 2022-05-31 thomas const struct got_error *
9346 5e22b737 2022-05-31 thomas got_worktree_patch_complete(struct got_fileindex *fileindex,
9347 36832a8e 2022-05-31 thomas const char *fileindex_path)
9349 5e22b737 2022-05-31 thomas const struct got_error *err = NULL;
9351 36832a8e 2022-05-31 thomas err = sync_fileindex(fileindex, fileindex_path);
9352 36832a8e 2022-05-31 thomas got_fileindex_free(fileindex);
9354 5e22b737 2022-05-31 thomas return err;
