2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
19 133d2798 2019-01-08 stsp #include <sys/tree.h>
21 d1f6d47b 2019-02-04 stsp #include <dirent.h>
22 12ce7a6c 2019-08-12 stsp #include <limits.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 303e14b5 2019-09-23 stsp #include <time.h>
28 86c3caaf 2018-03-09 stsp #include <fcntl.h>
29 86c3caaf 2018-03-09 stsp #include <errno.h>
30 86c3caaf 2018-03-09 stsp #include <unistd.h>
31 9d31a1d8 2018-03-11 stsp #include <sha1.h>
32 9d31a1d8 2018-03-11 stsp #include <zlib.h>
33 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
34 512f0d0e 2019-01-02 stsp #include <libgen.h>
35 ec22038e 2019-03-10 stsp #include <uuid.h>
36 7154f6ce 2019-03-27 stsp #include <util.h>
38 86c3caaf 2018-03-09 stsp #include "got_error.h"
39 86c3caaf 2018-03-09 stsp #include "got_repository.h"
40 5261c201 2018-04-01 stsp #include "got_reference.h"
41 9d31a1d8 2018-03-11 stsp #include "got_object.h"
42 1dd54920 2019-05-11 stsp #include "got_path.h"
43 e6209546 2019-08-22 stsp #include "got_cancel.h"
44 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 234035bc 2019-06-01 stsp #include "got_diff.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
51 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
52 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
53 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
54 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
55 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
56 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
57 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
61 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
65 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
67 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 507dc3bb 2018-12-29 stsp 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 0e039681 2021-11-15 stsp static const struct got_error *
480 0e039681 2021-11-15 stsp copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
482 0e039681 2021-11-15 stsp uint8_t fbuf[65536];
483 0e039681 2021-11-15 stsp size_t flen;
484 0e039681 2021-11-15 stsp ssize_t outlen;
486 0e039681 2021-11-15 stsp *outsize = 0;
488 0e039681 2021-11-15 stsp if (fseek(f, 0L, SEEK_SET) == -1)
489 0e039681 2021-11-15 stsp return got_ferror(f, GOT_ERR_IO);
492 0e039681 2021-11-15 stsp flen = fread(fbuf, 1, sizeof(fbuf), f);
493 0e039681 2021-11-15 stsp if (flen == 0) {
494 0e039681 2021-11-15 stsp if (ferror(f))
495 0e039681 2021-11-15 stsp return got_error_from_errno("fread");
496 0e039681 2021-11-15 stsp if (feof(f))
499 0e039681 2021-11-15 stsp outlen = write(outfd, fbuf, flen);
500 0e039681 2021-11-15 stsp if (outlen == -1)
501 0e039681 2021-11-15 stsp return got_error_from_errno("write");
502 0e039681 2021-11-15 stsp if (outlen != flen)
503 0e039681 2021-11-15 stsp return got_error(GOT_ERR_IO);
504 0e039681 2021-11-15 stsp *outsize += outlen;
507 0e039681 2021-11-15 stsp return NULL;
510 0e039681 2021-11-15 stsp static const struct got_error *
511 0e039681 2021-11-15 stsp merge_binary_file(int *overlapcnt, int merged_fd,
512 0e039681 2021-11-15 stsp FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
513 0e039681 2021-11-15 stsp const char *label_deriv, const char *label_orig, const char *label_deriv2,
514 0e039681 2021-11-15 stsp const char *ondisk_path)
516 0e039681 2021-11-15 stsp const struct got_error *err = NULL;
517 0e039681 2021-11-15 stsp int same_content, changed_deriv, changed_deriv2;
518 0e039681 2021-11-15 stsp int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
519 0e039681 2021-11-15 stsp off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
520 0e039681 2021-11-15 stsp char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
521 0e039681 2021-11-15 stsp char *base_path_orig = NULL, *base_path_deriv = NULL;
522 0e039681 2021-11-15 stsp char *base_path_deriv2 = NULL;
524 0e039681 2021-11-15 stsp *overlapcnt = 0;
526 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_deriv2);
528 0e039681 2021-11-15 stsp return err;
530 0e039681 2021-11-15 stsp if (same_content)
531 0e039681 2021-11-15 stsp return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
533 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv, f_orig);
535 0e039681 2021-11-15 stsp return err;
536 0e039681 2021-11-15 stsp changed_deriv = !same_content;
537 0e039681 2021-11-15 stsp err = check_files_equal(&same_content, f_deriv2, f_orig);
539 0e039681 2021-11-15 stsp return err;
540 0e039681 2021-11-15 stsp changed_deriv2 = !same_content;
542 0e039681 2021-11-15 stsp if (changed_deriv && changed_deriv2) {
543 0e039681 2021-11-15 stsp *overlapcnt = 1;
544 0e039681 2021-11-15 stsp if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
545 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
548 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
549 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
552 0e039681 2021-11-15 stsp if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
553 0e039681 2021-11-15 stsp err = got_error_from_errno("asprintf");
556 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_orig, &fd_orig,
557 0e039681 2021-11-15 stsp base_path_orig);
560 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
561 0e039681 2021-11-15 stsp base_path_deriv);
564 0e039681 2021-11-15 stsp err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
565 0e039681 2021-11-15 stsp base_path_deriv2);
568 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
571 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
574 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
577 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "Binary files differ and cannot be "
578 0e039681 2021-11-15 stsp "merged automatically:\n") < 0) {
579 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
582 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
583 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
584 0e039681 2021-11-15 stsp label_deriv ? " " : "",
585 0e039681 2021-11-15 stsp label_deriv ? label_deriv : "",
586 0e039681 2021-11-15 stsp path_deriv) < 0) {
587 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
590 0e039681 2021-11-15 stsp if (size_orig > 0) {
591 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
592 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_ORIG,
593 0e039681 2021-11-15 stsp label_orig ? " " : "",
594 0e039681 2021-11-15 stsp label_orig ? label_orig : "",
595 0e039681 2021-11-15 stsp path_orig) < 0) {
596 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
600 0e039681 2021-11-15 stsp if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
601 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
602 0e039681 2021-11-15 stsp path_deriv2,
603 0e039681 2021-11-15 stsp GOT_DIFF_CONFLICT_MARKER_END,
604 0e039681 2021-11-15 stsp label_deriv2 ? " " : "",
605 0e039681 2021-11-15 stsp label_deriv2 ? label_deriv2 : "") < 0) {
606 0e039681 2021-11-15 stsp err = got_error_from_errno("dprintf");
609 0e039681 2021-11-15 stsp } else if (changed_deriv)
610 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
611 0e039681 2021-11-15 stsp else if (changed_deriv2)
612 0e039681 2021-11-15 stsp err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
614 0e039681 2021-11-15 stsp if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
615 0e039681 2021-11-15 stsp err == NULL)
616 0e039681 2021-11-15 stsp err = got_error_from_errno2("unlink", path_orig);
617 0e039681 2021-11-15 stsp if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
618 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_orig);
619 0e039681 2021-11-15 stsp if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
620 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv);
621 0e039681 2021-11-15 stsp if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
622 0e039681 2021-11-15 stsp err = got_error_from_errno2("close", path_deriv2);
623 0e039681 2021-11-15 stsp free(path_orig);
624 0e039681 2021-11-15 stsp free(path_deriv);
625 0e039681 2021-11-15 stsp free(path_deriv2);
626 0e039681 2021-11-15 stsp free(base_path_orig);
627 0e039681 2021-11-15 stsp free(base_path_deriv);
628 0e039681 2021-11-15 stsp free(base_path_deriv2);
629 0e039681 2021-11-15 stsp 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 af54ae4a 2019-02-19 stsp 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);
672 0e039681 2021-11-15 stsp if (err->code != GOT_ERR_FILE_BINARY)
674 0e039681 2021-11-15 stsp err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
675 0e039681 2021-11-15 stsp f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
676 0e039681 2021-11-15 stsp ondisk_path);
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 db590691 2021-06-02 stsp if (fchmod(fileno(f_merged), 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 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
777 3818e3c4 2020-11-01 naddy goto done;
779 3818e3c4 2020-11-01 naddy if (fchmod(fileno(f), 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 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
996 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
997 67a66647 2021-05-31 stsp blob_orig);
1000 67a66647 2021-05-31 stsp free(base_path);
1003 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1004 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1005 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1007 db590691 2021-06-02 stsp f_orig = got_opentemp();
1008 db590691 2021-06-02 stsp if (f_orig == NULL) {
1009 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1010 db590691 2021-06-02 stsp goto done;
1014 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1015 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1016 14c901f1 2019-08-08 stsp base_path = NULL;
1017 14c901f1 2019-08-08 stsp goto done;
1020 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1022 14c901f1 2019-08-08 stsp goto done;
1023 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1024 14c901f1 2019-08-08 stsp blob_deriv);
1026 14c901f1 2019-08-08 stsp goto done;
1028 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1030 14c901f1 2019-08-08 stsp goto done;
1031 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1032 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1033 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1034 14c901f1 2019-08-08 stsp goto done;
1038 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1039 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1041 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1042 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1044 eec2f5a9 2021-06-03 stsp goto done;
1047 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1048 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1049 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1050 eec2f5a9 2021-06-03 stsp goto done;
1052 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1053 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1054 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1055 eec2f5a9 2021-06-03 stsp close(fd);
1056 eec2f5a9 2021-06-03 stsp goto done;
1060 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1061 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1062 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1064 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1065 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1066 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1067 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1068 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1069 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1070 14c901f1 2019-08-08 stsp free(base_path);
1071 67a66647 2021-05-31 stsp if (blob_orig_path) {
1072 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1073 67a66647 2021-05-31 stsp free(blob_orig_path);
1075 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1076 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1077 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1079 6353ad76 2019-02-08 stsp free(id_str);
1080 818c7501 2019-07-11 stsp free(label_deriv);
1081 ed6b5030 2020-10-20 stsp free(parent);
1082 4a1ddfc2 2019-01-12 stsp return err;
1085 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1086 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1087 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1088 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1090 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1091 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1093 65b05cec 2020-07-23 stsp *new_iep = NULL;
1095 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1097 054041d0 2020-06-24 stsp return err;
1099 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1100 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1102 054041d0 2020-06-24 stsp goto done;
1104 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1107 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1109 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1110 13d9040b 2019-03-27 stsp return err;
1113 1ebedb77 2019-10-19 stsp static mode_t
1114 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1116 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1118 1ebedb77 2019-10-19 stsp if (executable) {
1119 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1120 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1121 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1122 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1123 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1124 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1127 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1130 8ba819a3 2020-07-23 stsp /* forward declaration */
1131 13d9040b 2019-03-27 stsp static const struct got_error *
1132 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1133 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1134 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1135 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1136 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1137 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1140 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1141 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1143 8ba819a3 2020-07-23 stsp static const struct got_error *
1144 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1145 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1147 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1148 5a1fbc73 2020-07-23 stsp ssize_t elen;
1149 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1152 c6e8a826 2021-04-05 stsp *did_something = 0;
1155 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1156 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1157 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1158 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1159 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1160 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1162 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1163 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1164 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink())
1165 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1167 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1168 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1169 5a1fbc73 2020-07-23 stsp if (elen == -1)
1170 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1172 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1173 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1174 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1177 c6e8a826 2021-04-05 stsp *did_something = 1;
1178 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1179 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1180 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1181 5a1fbc73 2020-07-23 stsp return err;
1184 3c1ec782 2020-07-23 stsp static const struct got_error *
1185 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1186 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1188 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1189 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1190 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1192 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1194 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1195 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1196 3c1ec782 2020-07-23 stsp return NULL;
1200 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1201 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1202 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1203 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1204 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1206 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1207 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1208 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1210 ce031e9e 2020-10-20 stsp return err;
1211 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1212 ce031e9e 2020-10-20 stsp free(parent);
1213 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1215 ce031e9e 2020-10-20 stsp free(parent);
1216 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1217 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1218 3c1ec782 2020-07-23 stsp free(abspath);
1219 3c1ec782 2020-07-23 stsp return err;
1221 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1222 3c1ec782 2020-07-23 stsp free(abspath);
1224 3c1ec782 2020-07-23 stsp return err;
1226 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1228 3c1ec782 2020-07-23 stsp return err;
1231 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1232 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1233 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1234 3c1ec782 2020-07-23 stsp return NULL;
1237 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1238 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1239 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1240 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1241 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1242 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1244 3c1ec782 2020-07-23 stsp free(path_got);
1245 3c1ec782 2020-07-23 stsp return NULL;
1248 5a1fbc73 2020-07-23 stsp static const struct got_error *
1249 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1250 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1251 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1252 5267b9e4 2021-09-26 stsp int path_is_unversioned, int allow_bad_symlinks,
1253 5267b9e4 2021-09-26 stsp struct got_repository *repo,
1254 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1256 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1257 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1258 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1259 906c123b 2020-07-23 stsp char *path_got = NULL;
1260 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1261 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1263 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1266 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1267 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1268 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1269 8ba819a3 2020-07-23 stsp * in the blob object.
1272 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1273 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1274 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1275 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1276 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1277 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1278 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1279 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1280 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1281 3b9f0f87 2020-07-23 stsp progress_arg);
1283 8ba819a3 2020-07-23 stsp if (len > 0) {
1284 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1285 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1286 8ba819a3 2020-07-23 stsp len - hdrlen);
1287 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1288 8ba819a3 2020-07-23 stsp hdrlen = 0;
1290 8ba819a3 2020-07-23 stsp } while (len != 0);
1291 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1293 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1294 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1296 3c1ec782 2020-07-23 stsp return err;
1298 5267b9e4 2021-09-26 stsp if (*is_bad_symlink && !allow_bad_symlinks) {
1299 906c123b 2020-07-23 stsp /* install as a regular file */
1300 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1301 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1302 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1303 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1304 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1305 906c123b 2020-07-23 stsp goto done;
1308 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1309 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1310 c6e8a826 2021-04-05 stsp int symlink_replaced;
1311 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1312 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1313 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1314 c90c8ce3 2020-07-23 stsp goto done;
1316 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1317 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1319 f35fa46a 2020-07-23 stsp goto done;
1320 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1321 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1322 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1323 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1324 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1325 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1327 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1328 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1331 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1334 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1335 f4994adc 2020-10-20 stsp char *parent;
1336 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1338 f4994adc 2020-10-20 stsp goto done;
1339 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1340 f4994adc 2020-10-20 stsp free(parent);
1342 f35fa46a 2020-07-23 stsp goto done;
1344 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1345 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1347 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1348 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1349 f35fa46a 2020-07-23 stsp goto done;
1353 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1354 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1355 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1356 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1357 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1358 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1359 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1360 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1361 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1362 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1363 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1364 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1365 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1367 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1368 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1370 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1371 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1372 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1374 906c123b 2020-07-23 stsp free(path_got);
1375 8ba819a3 2020-07-23 stsp return err;
1378 8ba819a3 2020-07-23 stsp static const struct got_error *
1379 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1380 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1381 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1382 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1383 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1384 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1386 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1387 507dc3bb 2018-12-29 stsp int fd = -1;
1388 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1389 507dc3bb 2018-12-29 stsp int update = 0;
1390 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1392 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1393 8bd0cdad 2021-12-31 stsp O_CLOEXEC, GOT_DEFAULT_FILE_MODE);
1394 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1395 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1396 f5375317 2020-10-20 stsp char *parent;
1397 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1399 f5375317 2020-10-20 stsp return err;
1400 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1401 f5375317 2020-10-20 stsp free(parent);
1403 21908da4 2019-01-13 stsp return err;
1404 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1405 8bd0cdad 2021-12-31 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1406 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1407 21908da4 2019-01-13 stsp if (fd == -1)
1408 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1409 230a42bd 2019-05-11 jcs ondisk_path);
1410 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1411 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1412 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1413 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1414 3b9f0f87 2020-07-23 stsp goto done;
1416 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1417 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1418 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1419 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1420 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1421 507dc3bb 2018-12-29 stsp goto done;
1423 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1424 507dc3bb 2018-12-29 stsp ondisk_path);
1426 507dc3bb 2018-12-29 stsp goto done;
1427 507dc3bb 2018-12-29 stsp update = 1;
1430 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1433 3818e3c4 2020-11-01 naddy if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1434 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod",
1435 3818e3c4 2020-11-01 naddy update ? tmppath : ondisk_path);
1436 3818e3c4 2020-11-01 naddy goto done;
1439 bd6aa359 2020-07-23 stsp if (progress_cb) {
1440 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1441 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1443 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1444 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1447 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1448 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1450 bd6aa359 2020-07-23 stsp goto done;
1453 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1455 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1456 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1459 9d31a1d8 2018-03-11 stsp if (len > 0) {
1460 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1461 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1462 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1463 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1464 b87c6f83 2018-12-24 stsp goto done;
1465 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1466 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1467 b87c6f83 2018-12-24 stsp goto done;
1469 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1471 9d31a1d8 2018-03-11 stsp } while (len != 0);
1473 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1474 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1475 816dc654 2019-02-16 stsp goto done;
1478 507dc3bb 2018-12-29 stsp if (update) {
1479 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1480 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1481 f6d8c0ac 2020-11-09 stsp goto done;
1483 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1484 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1485 230a42bd 2019-05-11 jcs ondisk_path);
1486 68ed9ba5 2019-02-10 stsp goto done;
1488 63df146d 2020-11-09 stsp free(tmppath);
1489 63df146d 2020-11-09 stsp tmppath = NULL;
1493 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1494 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1495 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1496 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1497 507dc3bb 2018-12-29 stsp free(tmppath);
1498 6353ad76 2019-02-08 stsp return err;
1501 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1502 6353ad76 2019-02-08 stsp static const struct got_error *
1503 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1505 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1506 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1507 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1508 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1509 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1511 7154f6ce 2019-03-27 stsp int i = 0;
1512 9bdd68dd 2021-01-02 naddy char *line = NULL;
1513 9bdd68dd 2021-01-02 naddy size_t linesize = 0;
1514 9bdd68dd 2021-01-02 naddy ssize_t linelen;
1516 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1517 9bdd68dd 2021-01-02 naddy linelen = getline(&line, &linesize, f);
1518 9bdd68dd 2021-01-02 naddy if (linelen == -1) {
1519 7154f6ce 2019-03-27 stsp if (feof(f))
1521 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1525 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1526 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1528 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1533 9bdd68dd 2021-01-02 naddy free(line);
1535 7154f6ce 2019-03-27 stsp return err;
1538 e2b1e152 2019-07-13 stsp static int
1539 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1541 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1542 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1545 1ebedb77 2019-10-19 stsp static int
1546 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1548 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1549 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1550 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1551 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1552 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1553 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1556 c363b2c1 2019-08-03 stsp static unsigned char
1557 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1559 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1560 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1561 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1562 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1563 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1564 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1565 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1567 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1571 a919d5c4 2020-07-23 stsp static const struct got_error *
1572 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1573 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1574 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1576 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1577 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1578 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1579 a919d5c4 2020-07-23 stsp ssize_t elen;
1580 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1581 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1582 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1584 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1586 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1588 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1590 a919d5c4 2020-07-23 stsp return err;
1591 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1593 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1594 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1596 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1598 a919d5c4 2020-07-23 stsp if (len > 0) {
1599 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1600 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1601 a919d5c4 2020-07-23 stsp len - hdrlen);
1602 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1603 a919d5c4 2020-07-23 stsp hdrlen = 0;
1605 a919d5c4 2020-07-23 stsp } while (len != 0);
1606 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1608 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1609 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1610 a919d5c4 2020-07-23 stsp if (elen == -1)
1611 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1613 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1614 a919d5c4 2020-07-23 stsp if (elen == -1)
1615 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1618 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1619 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1621 a919d5c4 2020-07-23 stsp return NULL;
1624 7154f6ce 2019-03-27 stsp static const struct got_error *
1625 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1626 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1627 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1629 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1630 6353ad76 2019-02-08 stsp struct got_object_id id;
1631 6353ad76 2019-02-08 stsp size_t hdrlen;
1632 1338848f 2019-12-13 stsp int fd = -1;
1633 6353ad76 2019-02-08 stsp FILE *f = NULL;
1634 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1635 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1636 6353ad76 2019-02-08 stsp size_t flen, blen;
1637 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1639 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1640 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1643 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1644 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1645 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1647 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1648 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1649 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1650 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1651 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1653 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1654 882ef1b9 2019-12-13 stsp goto done;
1656 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1657 3d35a492 2019-12-13 stsp goto done;
1660 8bd0cdad 2021-12-31 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1661 5c02d2a5 2021-09-26 stsp if (fd == -1 && errno != ENOENT &&
1662 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
1663 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1664 5c02d2a5 2021-09-26 stsp else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1665 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1666 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1667 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1668 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1669 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1670 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1672 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1673 3d35a492 2019-12-13 stsp goto done;
1675 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1676 1338848f 2019-12-13 stsp goto done;
1680 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1681 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1682 1338848f 2019-12-13 stsp goto done;
1685 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1686 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1687 1338848f 2019-12-13 stsp goto done;
1688 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1689 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1690 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1691 1338848f 2019-12-13 stsp goto done;
1694 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1695 f179e66d 2020-07-23 stsp goto done;
1697 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1698 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1699 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1700 1338848f 2019-12-13 stsp goto done;
1703 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1704 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1705 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1707 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1709 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1711 1338848f 2019-12-13 stsp goto done;
1713 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1714 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1715 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1716 a919d5c4 2020-07-23 stsp goto done;
1719 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1720 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1721 ab0d4361 2019-12-13 stsp if (fd == -1) {
1722 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1723 ab0d4361 2019-12-13 stsp goto done;
1727 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1728 6353ad76 2019-02-08 stsp if (f == NULL) {
1729 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1730 6353ad76 2019-02-08 stsp goto done;
1733 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1735 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1736 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1738 7154f6ce 2019-03-27 stsp goto done;
1739 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1740 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1741 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1742 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1743 7154f6ce 2019-03-27 stsp goto done;
1745 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1746 6353ad76 2019-02-08 stsp if (flen != 0)
1747 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1749 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1750 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1751 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1753 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1754 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1755 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1756 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1760 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1763 6353ad76 2019-02-08 stsp hdrlen = 0;
1766 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1767 7154f6ce 2019-03-27 stsp rewind(f);
1768 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1769 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1770 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1773 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1774 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1775 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1776 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1777 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1778 9d31a1d8 2018-03-11 stsp return err;
1782 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1783 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1785 e2b1e152 2019-07-13 stsp static const struct got_error *
1786 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1787 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1789 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1790 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1791 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1793 e2b1e152 2019-07-13 stsp return NULL;
1796 9d31a1d8 2018-03-11 stsp static const struct got_error *
1797 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1798 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1799 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1800 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1801 0584f854 2019-04-06 stsp void *progress_arg)
1803 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1804 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1805 6353ad76 2019-02-08 stsp char *ondisk_path;
1806 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1807 b8f41171 2019-02-10 stsp struct stat sb;
1809 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1810 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1813 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1814 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1815 a76c42e6 2019-08-03 stsp goto done;
1817 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1820 abb4604f 2019-07-27 stsp goto done;
1821 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1822 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1824 f6764181 2021-09-24 stsp if (stat(ondisk_path, &sb) == -1) {
1825 f6764181 2021-09-24 stsp if (errno != ENOENT) {
1826 f6764181 2021-09-24 stsp err = got_error_from_errno2("stat",
1827 f6764181 2021-09-24 stsp ondisk_path);
1828 f6764181 2021-09-24 stsp goto done;
1830 f6764181 2021-09-24 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1831 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1833 f6764181 2021-09-24 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1834 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1836 f6764181 2021-09-24 stsp status = GOT_STATUS_OBSTRUCTED;
1840 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1842 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1843 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1844 b8f41171 2019-02-10 stsp goto done;
1846 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1848 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1849 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1851 5036ab18 2020-04-18 stsp goto done;
1854 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1855 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1856 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1858 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1859 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1860 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1861 c6e8a826 2021-04-05 stsp * updating contents of this file.
1863 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1864 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1865 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1866 c6e8a826 2021-04-05 stsp /* Same commit. */
1867 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1868 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1870 e2b1e152 2019-07-13 stsp goto done;
1871 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1873 6353ad76 2019-02-08 stsp goto done;
1875 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1876 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1877 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1878 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1879 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1880 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1882 0f58026f 2021-04-05 stsp goto done;
1883 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1885 b8f41171 2019-02-10 stsp goto done;
1889 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1891 6353ad76 2019-02-08 stsp goto done;
1893 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1894 234035bc 2019-06-01 stsp int update_timestamps;
1895 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1896 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1897 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1898 234035bc 2019-06-01 stsp struct got_object_id id2;
1899 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1900 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1902 f69721c3 2019-10-21 stsp goto done;
1904 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1905 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1906 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1907 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1908 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1909 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1910 f69721c3 2019-10-21 stsp goto done;
1912 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1913 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1914 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1915 234035bc 2019-06-01 stsp goto done;
1918 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1919 36bf999c 2020-07-23 stsp char *link_target;
1920 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1922 36bf999c 2020-07-23 stsp goto done;
1923 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1924 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1925 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1926 36bf999c 2020-07-23 stsp free(link_target);
1928 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1929 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1930 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1931 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1933 f69721c3 2019-10-21 stsp free(label_orig);
1934 234035bc 2019-06-01 stsp if (blob2)
1935 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1937 909d120e 2019-09-22 stsp goto done;
1939 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1940 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1941 234035bc 2019-06-01 stsp * unmodified files again.
1943 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1944 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1945 234035bc 2019-06-01 stsp update_timestamps);
1946 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1947 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1948 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1949 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1950 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1952 1ee397ad 2019-07-12 stsp goto done;
1953 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1954 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1956 13d9040b 2019-03-27 stsp goto done;
1958 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1959 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1960 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1961 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1962 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1963 5267b9e4 2021-09-26 stsp status == GOT_STATUS_UNVERSIONED, 0,
1964 5267b9e4 2021-09-26 stsp repo, progress_cb, progress_arg);
1966 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1967 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
1968 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
1969 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1970 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1973 13d9040b 2019-03-27 stsp goto done;
1976 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
1977 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
1978 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
1980 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
1981 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
1982 054041d0 2020-06-24 stsp &blob->id);
1985 13d9040b 2019-03-27 stsp goto done;
1987 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
1988 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
1989 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
1992 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1994 6353ad76 2019-02-08 stsp free(ondisk_path);
1995 8da9e5f4 2019-01-12 stsp return err;
1998 90285c3b 2019-01-08 stsp static const struct got_error *
1999 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2001 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2002 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2004 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2005 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2007 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2008 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2009 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2011 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2012 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2014 1c4cdd89 2021-06-20 stsp goto done;
2015 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2016 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2017 fddefe3b 2020-10-20 stsp free(ondisk_path);
2018 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2019 1c4cdd89 2021-06-20 stsp parent = NULL;
2020 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2021 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2022 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2023 fddefe3b 2020-10-20 stsp ondisk_path);
2026 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2032 90285c3b 2019-01-08 stsp free(ondisk_path);
2033 1c4cdd89 2021-06-20 stsp free(parent);
2034 90285c3b 2019-01-08 stsp return err;
2037 708d8e67 2019-03-27 stsp static const struct got_error *
2038 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2039 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2040 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2042 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2043 708d8e67 2019-03-27 stsp unsigned char status;
2044 708d8e67 2019-03-27 stsp struct stat sb;
2045 708d8e67 2019-03-27 stsp char *ondisk_path;
2047 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2048 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2050 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2052 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2054 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2056 5a58a424 2020-06-23 stsp goto done;
2058 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2059 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2060 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2061 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2062 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2063 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2064 993e2a1b 2020-07-23 stsp goto done;
2066 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2067 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2068 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2069 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2071 993e2a1b 2020-07-23 stsp goto done;
2072 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2073 993e2a1b 2020-07-23 stsp ie->path);
2074 993e2a1b 2020-07-23 stsp goto done;
2077 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2078 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2079 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2081 5a58a424 2020-06-23 stsp goto done;
2083 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2084 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2086 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2087 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2089 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2091 5a58a424 2020-06-23 stsp goto done;
2092 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2093 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2095 5a58a424 2020-06-23 stsp goto done;
2097 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2100 5a58a424 2020-06-23 stsp free(ondisk_path);
2101 fc6346c4 2019-03-27 stsp return err;
2104 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2105 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2106 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2107 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2108 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2109 8da9e5f4 2019-01-12 stsp void *progress_arg;
2110 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2111 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2114 512f0d0e 2019-01-02 stsp static const struct got_error *
2115 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2116 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2118 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2120 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2121 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2123 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2124 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2127 8da9e5f4 2019-01-12 stsp static const struct got_error *
2128 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2130 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2132 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2133 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2135 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2136 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2139 9d31a1d8 2018-03-11 stsp static const struct got_error *
2140 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2142 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2143 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2144 8da9e5f4 2019-01-12 stsp char *path;
2146 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2147 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2149 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2150 63c5ca5d 2019-08-24 stsp return NULL;
2152 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2153 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2155 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2157 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2158 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2160 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2161 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2163 8da9e5f4 2019-01-12 stsp free(path);
2164 0cd1c46a 2019-03-11 stsp return err;
2167 b2118c49 2020-07-28 stsp const struct got_error *
2168 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2170 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2172 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2173 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2174 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2175 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2178 b2118c49 2020-07-28 stsp return NULL;
2181 818c7501 2019-07-11 stsp static const struct got_error *
2182 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2184 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2185 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2187 517bab73 2019-03-11 stsp *refname = NULL;
2189 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2191 b2118c49 2020-07-28 stsp return err;
2193 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2194 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2195 0647c563 2019-03-11 stsp *refname = NULL;
2197 517bab73 2019-03-11 stsp free(uuidstr);
2198 517bab73 2019-03-11 stsp return err;
2201 818c7501 2019-07-11 stsp const struct got_error *
2202 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2204 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2207 818c7501 2019-07-11 stsp static const struct got_error *
2208 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2210 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2211 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2214 818c7501 2019-07-11 stsp static const struct got_error *
2215 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2217 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2220 818c7501 2019-07-11 stsp static const struct got_error *
2221 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2223 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2224 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2227 818c7501 2019-07-11 stsp static const struct got_error *
2228 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2230 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2231 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2234 0ebf8283 2019-07-24 stsp static const struct got_error *
2235 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2237 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2238 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2241 0ebf8283 2019-07-24 stsp static const struct got_error *
2242 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2244 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2245 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2248 0ebf8283 2019-07-24 stsp static const struct got_error *
2249 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2251 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2252 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2255 0ebf8283 2019-07-24 stsp static const struct got_error *
2256 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2258 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2259 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2262 0ebf8283 2019-07-24 stsp const struct got_error *
2263 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2264 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2266 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2267 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2268 0ebf8283 2019-07-24 stsp *path = NULL;
2269 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2271 0ebf8283 2019-07-24 stsp return NULL;
2274 f259c4c1 2021-09-24 stsp static const struct got_error *
2275 f259c4c1 2021-09-24 stsp get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2277 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2278 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2281 f259c4c1 2021-09-24 stsp static const struct got_error *
2282 f259c4c1 2021-09-24 stsp get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2284 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2285 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2289 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2290 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2292 517bab73 2019-03-11 stsp static const struct got_error *
2293 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2295 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2296 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2297 517bab73 2019-03-11 stsp char *refname;
2299 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2301 517bab73 2019-03-11 stsp return err;
2303 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2305 0cd1c46a 2019-03-11 stsp goto done;
2307 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2309 0cd1c46a 2019-03-11 stsp free(refname);
2311 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2312 3e3a69f1 2019-07-25 stsp return err;
2315 3e3a69f1 2019-07-25 stsp static const struct got_error *
2316 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2318 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2320 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2321 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2322 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2323 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2325 9d31a1d8 2018-03-11 stsp return err;
2329 ebf99748 2019-05-09 stsp static const struct got_error *
2330 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2331 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2333 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2334 ebf99748 2019-05-09 stsp FILE *index = NULL;
2336 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2337 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2338 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2339 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2341 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2343 ebf99748 2019-05-09 stsp goto done;
2345 00fe21f2 2021-12-31 stsp index = fopen(*fileindex_path, "rbe");
2346 ebf99748 2019-05-09 stsp if (index == NULL) {
2347 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2348 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2350 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2351 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2352 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2355 ebf99748 2019-05-09 stsp if (err) {
2356 ebf99748 2019-05-09 stsp free(*fileindex_path);
2357 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2358 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2359 ebf99748 2019-05-09 stsp *fileindex = NULL;
2361 ebf99748 2019-05-09 stsp return err;
2364 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2365 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2366 c932eeeb 2019-05-22 stsp const char *path;
2367 c932eeeb 2019-05-22 stsp size_t path_len;
2368 c932eeeb 2019-05-22 stsp const char *entry_name;
2369 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2370 a484d721 2019-06-10 stsp void *progress_arg;
2373 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2374 c932eeeb 2019-05-22 stsp static const struct got_error *
2375 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2377 1ee397ad 2019-07-12 stsp const struct got_error *err;
2378 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2380 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2381 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2382 c932eeeb 2019-05-22 stsp return NULL;
2383 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2384 102ff934 2019-06-11 stsp return NULL;
2386 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2387 a769b60b 2021-06-27 stsp return NULL;
2389 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2390 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2391 c932eeeb 2019-05-22 stsp return NULL;
2393 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2394 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2395 edd02c5e 2019-07-11 stsp ie->path);
2397 1ee397ad 2019-07-12 stsp return err;
2399 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2400 c932eeeb 2019-05-22 stsp return NULL;
2403 a615e0e7 2020-12-16 stsp static const struct got_error *
2404 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2405 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2406 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2408 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2410 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2411 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2412 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2413 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2414 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2415 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2417 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2418 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2421 9c6338c4 2019-06-02 stsp static const struct got_error *
2422 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2424 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2425 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2426 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2427 867630bb 2020-01-17 stsp struct timespec timeout;
2429 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2430 9c6338c4 2019-06-02 stsp fileindex_path);
2432 9c6338c4 2019-06-02 stsp goto done;
2434 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2436 9c6338c4 2019-06-02 stsp goto done;
2438 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2439 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2440 9c6338c4 2019-06-02 stsp fileindex_path);
2441 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2445 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2446 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2447 867630bb 2020-01-17 stsp * was recorded in the file index.
2449 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2450 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2451 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2453 9c6338c4 2019-06-02 stsp if (new_index)
2454 9c6338c4 2019-06-02 stsp fclose(new_index);
2455 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2456 9c6338c4 2019-06-02 stsp return err;
2459 6ced4176 2019-07-12 stsp static const struct got_error *
2460 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2461 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2462 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2464 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2465 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2466 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2467 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2469 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2470 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2471 6ced4176 2019-07-12 stsp *tree_id = NULL;
2473 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2474 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2475 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2476 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2477 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2478 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2479 6ced4176 2019-07-12 stsp goto done;
2481 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2482 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2484 6ced4176 2019-07-12 stsp goto done;
2485 6ced4176 2019-07-12 stsp return NULL;
2488 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2490 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2491 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2492 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2493 6ced4176 2019-07-12 stsp goto done;
2496 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2497 6ced4176 2019-07-12 stsp in_repo_path);
2499 6ced4176 2019-07-12 stsp goto done;
2501 6ced4176 2019-07-12 stsp free(in_repo_path);
2502 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2504 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2506 6ced4176 2019-07-12 stsp goto done;
2508 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2509 6ced4176 2019-07-12 stsp /* Check out a single file. */
2510 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2511 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2512 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2513 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2514 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2515 6ced4176 2019-07-12 stsp goto done;
2517 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2518 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2519 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2520 6ced4176 2019-07-12 stsp goto done;
2523 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2524 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2526 6ced4176 2019-07-12 stsp return err;
2527 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2528 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2529 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2530 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2531 6ced4176 2019-07-12 stsp goto done;
2534 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2535 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2537 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2538 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2539 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2540 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2541 6ced4176 2019-07-12 stsp goto done;
2543 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2544 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2545 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2546 6ced4176 2019-07-12 stsp goto done;
2551 6ced4176 2019-07-12 stsp free(in_repo_path);
2552 6ced4176 2019-07-12 stsp if (err) {
2553 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2554 6ced4176 2019-07-12 stsp free(*tree_relpath);
2555 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2556 6ced4176 2019-07-12 stsp free(*tree_id);
2557 6ced4176 2019-07-12 stsp *tree_id = NULL;
2559 07ed472d 2019-07-12 stsp return err;
2562 07ed472d 2019-07-12 stsp static const struct got_error *
2563 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2564 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2565 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2566 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2568 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2569 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2570 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2571 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2572 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2574 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2575 7f47418f 2019-12-20 stsp if (err) {
2576 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2577 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2578 7f47418f 2019-12-20 stsp goto done;
2579 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2580 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2582 7f47418f 2019-12-20 stsp return err;
2585 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2586 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2588 07ed472d 2019-07-12 stsp goto done;
2590 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2592 07ed472d 2019-07-12 stsp goto done;
2594 07ed472d 2019-07-12 stsp if (entry_name &&
2595 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2596 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2597 07ed472d 2019-07-12 stsp goto done;
2600 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2601 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2602 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2603 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2604 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2605 07ed472d 2019-07-12 stsp arg.repo = repo;
2606 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2607 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2608 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2609 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2610 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2611 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2614 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2615 07ed472d 2019-07-12 stsp if (commit)
2616 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2617 6ced4176 2019-07-12 stsp return err;
2620 9d31a1d8 2018-03-11 stsp const struct got_error *
2621 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2622 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2623 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2624 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2626 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2627 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2628 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2629 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2630 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2631 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2632 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2633 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2634 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2635 f2ea84fa 2019-07-27 stsp int entry_type;
2636 f2ea84fa 2019-07-27 stsp char *relpath;
2637 f2ea84fa 2019-07-27 stsp char *entry_name;
2638 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2639 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2641 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2643 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2645 9d31a1d8 2018-03-11 stsp return err;
2647 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2648 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2649 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2650 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2651 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2652 f2ea84fa 2019-07-27 stsp goto done;
2655 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2656 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2657 f2ea84fa 2019-07-27 stsp if (err) {
2658 f2ea84fa 2019-07-27 stsp free(tpd);
2659 6ced4176 2019-07-12 stsp goto done;
2662 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2663 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2664 f2ea84fa 2019-07-27 stsp if (err) {
2665 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2666 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2667 f2ea84fa 2019-07-27 stsp free(tpd);
2668 f2ea84fa 2019-07-27 stsp goto done;
2671 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2673 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2677 51514078 2018-12-25 stsp * Read the file index.
2678 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2679 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2681 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2683 c4cdcb68 2019-04-03 stsp goto done;
2685 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2686 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2687 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2689 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2690 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2691 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2695 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2696 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2697 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2698 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2699 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2700 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2701 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2702 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2706 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2708 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2709 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2710 af12c6b9 2019-06-04 stsp err = sync_err;
2712 9c6338c4 2019-06-02 stsp free(fileindex_path);
2714 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2715 9d31a1d8 2018-03-11 stsp if (commit)
2716 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2717 5ade8233 2019-07-12 stsp if (fileindex)
2718 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2719 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2720 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2721 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2722 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2723 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2724 f2ea84fa 2019-07-27 stsp free(tpd);
2726 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2727 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2728 9d31a1d8 2018-03-11 stsp err = unlockerr;
2729 f8d1f275 2019-02-04 stsp return err;
2732 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2733 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2734 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2735 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2736 234035bc 2019-06-01 stsp void *progress_arg;
2737 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2738 234035bc 2019-06-01 stsp void *cancel_arg;
2739 f69721c3 2019-10-21 stsp const char *label_orig;
2740 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2741 5267b9e4 2021-09-26 stsp int allow_bad_symlinks;
2744 234035bc 2019-06-01 stsp static const struct got_error *
2745 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2746 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2747 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2748 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2750 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2751 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2752 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2753 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2754 234035bc 2019-06-01 stsp struct stat sb;
2755 234035bc 2019-06-01 stsp unsigned char status;
2756 234035bc 2019-06-01 stsp int local_changes_subsumed;
2757 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2758 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2760 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2761 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2762 d6c87207 2019-08-02 stsp strlen(path2));
2763 1ee397ad 2019-07-12 stsp if (ie == NULL)
2764 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2765 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2767 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2768 234035bc 2019-06-01 stsp path2) == -1)
2769 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2771 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2774 234035bc 2019-06-01 stsp goto done;
2776 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2777 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2778 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2779 234035bc 2019-06-01 stsp goto done;
2781 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2782 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2783 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2784 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2785 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2786 234035bc 2019-06-01 stsp goto done;
2789 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2790 36bf999c 2020-07-23 stsp char *link_target2;
2791 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2793 36bf999c 2020-07-23 stsp goto done;
2794 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2795 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2796 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2797 36bf999c 2020-07-23 stsp free(link_target2);
2801 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2802 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2803 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2804 1af628f4 2021-06-03 stsp goto done;
2806 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2807 1af628f4 2021-06-03 stsp f_orig, blob1);
2809 1af628f4 2021-06-03 stsp goto done;
2811 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2812 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2813 1af628f4 2021-06-03 stsp goto done;
2814 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2815 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2817 1af628f4 2021-06-03 stsp goto done;
2819 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2820 1af628f4 2021-06-03 stsp if (fd == -1) {
2821 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2822 1af628f4 2021-06-03 stsp ondisk_path);
2823 1af628f4 2021-06-03 stsp goto done;
2825 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2826 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2827 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2828 1af628f4 2021-06-03 stsp ondisk_path);
2829 1af628f4 2021-06-03 stsp close(fd);
2830 1af628f4 2021-06-03 stsp goto done;
2832 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2834 1af628f4 2021-06-03 stsp goto done;
2835 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2836 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2837 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2838 1af628f4 2021-06-03 stsp goto done;
2840 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2841 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2842 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2843 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2844 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2846 234035bc 2019-06-01 stsp } else if (blob1) {
2847 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2848 d6c87207 2019-08-02 stsp strlen(path1));
2849 1ee397ad 2019-07-12 stsp if (ie == NULL)
2850 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2851 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2853 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2854 2b92fad7 2019-06-02 stsp path1) == -1)
2855 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2857 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2860 2b92fad7 2019-06-02 stsp goto done;
2862 2b92fad7 2019-06-02 stsp switch (status) {
2863 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2864 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2865 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2867 1ee397ad 2019-07-12 stsp goto done;
2868 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2870 2b92fad7 2019-06-02 stsp goto done;
2872 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2874 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2875 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2876 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2877 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2879 1ee397ad 2019-07-12 stsp goto done;
2881 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2883 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2884 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2885 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2887 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2888 0a22ca1a 2020-09-23 stsp * exists in the repository.
2890 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2892 0a22ca1a 2020-09-23 stsp goto done;
2893 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2894 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2895 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2897 0a22ca1a 2020-09-23 stsp goto done;
2898 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2901 0a22ca1a 2020-09-23 stsp goto done;
2903 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2906 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2907 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2909 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2910 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2913 0a22ca1a 2020-09-23 stsp goto done;
2916 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2917 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2918 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2919 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2921 1ee397ad 2019-07-12 stsp goto done;
2923 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2924 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2926 1ee397ad 2019-07-12 stsp goto done;
2931 234035bc 2019-06-01 stsp } else if (blob2) {
2932 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2933 234035bc 2019-06-01 stsp path2) == -1)
2934 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2935 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2936 d6c87207 2019-08-02 stsp strlen(path2));
2938 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2939 7f91a133 2019-12-13 stsp -1, NULL, repo);
2941 234035bc 2019-06-01 stsp goto done;
2942 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2943 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2944 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2945 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2946 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2947 1ee397ad 2019-07-12 stsp status, path2);
2948 234035bc 2019-06-01 stsp goto done;
2950 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2951 36bf999c 2020-07-23 stsp char *link_target2;
2952 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2955 36bf999c 2020-07-23 stsp goto done;
2956 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2957 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2958 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2959 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2960 36bf999c 2020-07-23 stsp free(link_target2);
2961 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2962 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2963 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2964 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2965 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2966 526a746f 2020-07-23 stsp a->progress_arg);
2968 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2969 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2972 dfe9fba0 2020-07-23 stsp goto done;
2973 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2974 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2975 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
2976 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2978 234035bc 2019-06-01 stsp goto done;
2981 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2982 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2983 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2984 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2985 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2986 5267b9e4 2021-09-26 stsp 0, 1, a->allow_bad_symlinks, repo,
2987 5267b9e4 2021-09-26 stsp a->progress_cb, a->progress_arg);
2989 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2990 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2991 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2994 234035bc 2019-06-01 stsp goto done;
2995 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2997 234035bc 2019-06-01 stsp goto done;
2998 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2999 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3000 3969253a 2020-03-07 stsp if (err) {
3001 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3002 3969253a 2020-03-07 stsp goto done;
3004 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3005 2b92fad7 2019-06-02 stsp if (err) {
3006 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3007 2b92fad7 2019-06-02 stsp goto done;
3009 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3010 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3011 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3016 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3017 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3018 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3019 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3020 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3021 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3022 1af628f4 2021-06-03 stsp free(id_str);
3023 54d5be07 2021-06-03 stsp free(label_deriv2);
3024 234035bc 2019-06-01 stsp free(ondisk_path);
3025 234035bc 2019-06-01 stsp return err;
3028 69de9dd4 2021-09-03 stsp static const struct got_error *
3029 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3031 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3033 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3034 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3035 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3036 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3037 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3039 69de9dd4 2021-09-03 stsp return NULL;
3042 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3043 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3044 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3045 234035bc 2019-06-01 stsp struct got_repository *repo;
3048 234035bc 2019-06-01 stsp static const struct got_error *
3049 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3050 69de9dd4 2021-09-03 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3051 69de9dd4 2021-09-03 stsp struct got_object_id *id2, const char *path1, const char *path2,
3052 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3054 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3055 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3056 234035bc 2019-06-01 stsp unsigned char status;
3057 234035bc 2019-06-01 stsp struct stat sb;
3058 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3059 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3060 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3061 234035bc 2019-06-01 stsp char *ondisk_path;
3063 69de9dd4 2021-09-03 stsp if (id == NULL)
3064 69de9dd4 2021-09-03 stsp return NULL;
3066 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3067 69de9dd4 2021-09-03 stsp if (ie == NULL)
3068 69de9dd4 2021-09-03 stsp return NULL;
3070 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3072 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3074 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3075 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3076 5546d466 2021-09-02 stsp free(ondisk_path);
3078 234035bc 2019-06-01 stsp return err;
3079 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3080 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3082 234035bc 2019-06-01 stsp return NULL;
3085 818c7501 2019-07-11 stsp static const struct got_error *
3086 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3087 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3088 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3089 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3090 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3092 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3093 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3094 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3095 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3096 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3097 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3099 03415a1a 2019-06-02 stsp if (commit_id1) {
3100 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3101 03415a1a 2019-06-02 stsp worktree->path_prefix);
3102 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3103 03415a1a 2019-06-02 stsp goto done;
3105 69d57f3d 2020-07-31 stsp if (tree_id1) {
3106 69d57f3d 2020-07-31 stsp char *id_str;
3108 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3110 03415a1a 2019-06-02 stsp goto done;
3112 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3114 f69721c3 2019-10-21 stsp goto done;
3116 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3117 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3118 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3119 f69721c3 2019-10-21 stsp free(id_str);
3120 f69721c3 2019-10-21 stsp goto done;
3122 f69721c3 2019-10-21 stsp free(id_str);
3125 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3126 234035bc 2019-06-01 stsp worktree->path_prefix);
3128 234035bc 2019-06-01 stsp goto done;
3130 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3132 234035bc 2019-06-01 stsp goto done;
3134 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3135 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3136 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3137 69de9dd4 2021-09-03 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3138 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3140 69de9dd4 2021-09-03 stsp goto done;
3142 234035bc 2019-06-01 stsp arg.worktree = worktree;
3143 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3144 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3145 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3146 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3147 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3148 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3149 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3150 5267b9e4 2021-09-26 stsp arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3151 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3152 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3153 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3154 af12c6b9 2019-06-04 stsp err = sync_err;
3156 234035bc 2019-06-01 stsp if (tree1)
3157 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3158 234035bc 2019-06-01 stsp if (tree2)
3159 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3160 f69721c3 2019-10-21 stsp free(label_orig);
3161 818c7501 2019-07-11 stsp return err;
3164 818c7501 2019-07-11 stsp const struct got_error *
3165 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3166 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3167 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3168 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3170 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3171 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3172 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3174 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3176 818c7501 2019-07-11 stsp return err;
3178 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3180 818c7501 2019-07-11 stsp goto done;
3182 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3183 69de9dd4 2021-09-03 stsp worktree);
3185 818c7501 2019-07-11 stsp goto done;
3187 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3188 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3189 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3191 818c7501 2019-07-11 stsp if (fileindex)
3192 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3193 818c7501 2019-07-11 stsp free(fileindex_path);
3194 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3195 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3196 234035bc 2019-06-01 stsp err = unlockerr;
3197 234035bc 2019-06-01 stsp return err;
3200 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3201 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3202 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3203 927df6b7 2019-02-10 stsp const char *status_path;
3204 927df6b7 2019-02-10 stsp size_t status_path_len;
3205 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3206 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3207 f8d1f275 2019-02-04 stsp void *status_arg;
3208 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3209 f8d1f275 2019-02-04 stsp void *cancel_arg;
3210 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3211 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3212 f2a9dc41 2019-12-13 tracey int report_unchanged;
3213 3143d852 2020-06-25 stsp int no_ignores;
3216 f8d1f275 2019-02-04 stsp static const struct got_error *
3217 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3218 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3219 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3220 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3222 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3223 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3224 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3225 927df6b7 2019-02-10 stsp struct stat sb;
3226 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3227 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3228 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3230 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3232 98eaaa12 2019-08-03 stsp return err;
3234 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3235 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3236 98eaaa12 2019-08-03 stsp return NULL;
3238 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3239 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3240 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3242 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3243 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3244 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3246 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3247 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3248 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3249 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3250 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3253 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3254 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3257 927df6b7 2019-02-10 stsp static const struct got_error *
3258 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3259 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3261 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3262 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3263 f8d1f275 2019-02-04 stsp char *abspath;
3265 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3266 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3268 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3269 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3270 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3271 927df6b7 2019-02-10 stsp return NULL;
3273 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3274 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3275 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3276 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3278 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3279 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3280 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3283 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3284 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3285 f8d1f275 2019-02-04 stsp free(abspath);
3286 9d31a1d8 2018-03-11 stsp return err;
3289 f8d1f275 2019-02-04 stsp static const struct got_error *
3290 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3292 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3293 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3294 2ec1f75b 2019-03-26 stsp unsigned char status;
3296 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3297 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3299 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3300 927df6b7 2019-02-10 stsp return NULL;
3302 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3303 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3304 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3305 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3307 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3308 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3309 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3313 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3315 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3317 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3318 6841da00 2019-08-08 stsp free((char *)pe->path);
3319 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3323 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3325 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3327 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3328 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3329 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3330 6841da00 2019-08-08 stsp free((char *)pe->path);
3332 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3335 6841da00 2019-08-08 stsp static const struct got_error *
3336 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3338 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3339 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3340 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3341 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3342 6841da00 2019-08-08 stsp size_t linesize = 0;
3343 6841da00 2019-08-08 stsp ssize_t linelen;
3345 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3346 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3347 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3348 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3350 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3351 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3352 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3354 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3355 bd8de430 2019-10-04 stsp if (line[0] == '#')
3358 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3359 bd8de430 2019-10-04 stsp if (line[0] == '!')
3362 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3363 6841da00 2019-08-08 stsp line) == -1) {
3364 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3365 6841da00 2019-08-08 stsp goto done;
3367 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3369 6841da00 2019-08-08 stsp goto done;
3371 6841da00 2019-08-08 stsp if (ferror(f)) {
3372 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3373 6841da00 2019-08-08 stsp goto done;
3376 6841da00 2019-08-08 stsp dirpath = strdup(path);
3377 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3378 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3379 6841da00 2019-08-08 stsp goto done;
3381 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3383 6841da00 2019-08-08 stsp free(line);
3384 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3385 6841da00 2019-08-08 stsp free(dirpath);
3386 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3388 6841da00 2019-08-08 stsp return err;
3392 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3394 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3396 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3397 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3398 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3399 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3401 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3402 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3404 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3406 bd8de430 2019-10-04 stsp pattern += 3;
3408 bd8de430 2019-10-04 stsp while (*p) {
3409 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3410 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3411 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3412 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3414 bd8de430 2019-10-04 stsp while (*p == '/')
3424 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3425 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3426 6841da00 2019-08-08 stsp * ignores backwards.
3428 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3429 6841da00 2019-08-08 stsp while (pe) {
3430 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3431 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3432 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3433 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3434 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3435 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3436 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3437 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3438 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3443 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3449 6841da00 2019-08-08 stsp static const struct got_error *
3450 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3451 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3453 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3454 6841da00 2019-08-08 stsp char *ignorespath;
3455 886cec17 2019-12-15 stsp int fd = -1;
3456 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3458 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3459 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3460 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3462 886cec17 2019-12-15 stsp if (dirfd != -1) {
3463 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3464 886cec17 2019-12-15 stsp if (fd == -1) {
3465 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3466 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3467 886cec17 2019-12-15 stsp ignorespath);
3469 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3470 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3471 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3472 886cec17 2019-12-15 stsp ignorespath);
3475 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3479 00fe21f2 2021-12-31 stsp ignoresfile = fopen(ignorespath, "re");
3480 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3481 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3482 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3483 886cec17 2019-12-15 stsp ignorespath);
3485 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3488 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3489 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3490 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3491 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3492 6841da00 2019-08-08 stsp free(ignorespath);
3493 6841da00 2019-08-08 stsp return err;
3496 f8d1f275 2019-02-04 stsp static const struct got_error *
3497 62da3196 2021-10-01 stsp status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3498 62da3196 2021-10-01 stsp int dirfd)
3500 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3501 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3502 f8d1f275 2019-02-04 stsp char *path = NULL;
3504 62da3196 2021-10-01 stsp if (ignore != NULL)
3505 62da3196 2021-10-01 stsp *ignore = 0;
3507 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3508 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3510 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3511 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3512 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3514 f8d1f275 2019-02-04 stsp path = de->d_name;
3517 62da3196 2021-10-01 stsp if (de->d_type == DT_DIR) {
3518 62da3196 2021-10-01 stsp if (!a->no_ignores && ignore != NULL &&
3519 62da3196 2021-10-01 stsp match_ignores(a->ignores, path))
3520 62da3196 2021-10-01 stsp *ignore = 1;
3521 62da3196 2021-10-01 stsp } else if (!match_ignores(a->ignores, path) &&
3522 62da3196 2021-10-01 stsp got_path_is_child(path, a->status_path, a->status_path_len))
3523 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3524 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3525 f8d1f275 2019-02-04 stsp if (parent_path[0])
3526 f8d1f275 2019-02-04 stsp free(path);
3527 b72f483a 2019-02-05 stsp return err;
3530 347d1d3e 2019-07-12 stsp static const struct got_error *
3531 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3533 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3534 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3536 3143d852 2020-06-25 stsp if (a->no_ignores)
3537 3143d852 2020-06-25 stsp return NULL;
3539 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3540 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3542 3143d852 2020-06-25 stsp return err;
3544 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3545 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3547 3143d852 2020-06-25 stsp return err;
3550 3143d852 2020-06-25 stsp static const struct got_error *
3551 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3552 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3553 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3554 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3556 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3557 abb4604f 2019-07-27 stsp struct stat sb;
3559 0e33f8e0 2021-09-01 stsp if (!no_ignores && match_ignores(ignores, path))
3560 ff56836b 2021-07-08 stsp return NULL;
3562 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3564 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3565 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3567 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3568 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3569 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3570 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3571 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3572 abb4604f 2019-07-27 stsp return NULL;
3575 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3576 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3577 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3579 abb4604f 2019-07-27 stsp return NULL;
3582 3143d852 2020-06-25 stsp static const struct got_error *
3583 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3584 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3586 3143d852 2020-06-25 stsp const struct got_error *err;
3587 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3589 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3590 3143d852 2020-06-25 stsp ".cvsignore");
3592 3143d852 2020-06-25 stsp return err;
3594 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3595 3143d852 2020-06-25 stsp ".gitignore");
3597 3143d852 2020-06-25 stsp return err;
3599 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3600 3143d852 2020-06-25 stsp if (err) {
3601 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3602 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3603 3143d852 2020-06-25 stsp return err;
3605 3143d852 2020-06-25 stsp for (;;) {
3606 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3607 3143d852 2020-06-25 stsp ".cvsignore");
3610 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3611 3143d852 2020-06-25 stsp ".gitignore");
3614 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3615 3143d852 2020-06-25 stsp if (err) {
3616 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3617 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3620 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3622 b737c85a 2020-06-26 stsp free(parent_path);
3623 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3624 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3627 b737c85a 2020-06-26 stsp free(parent_path);
3628 b737c85a 2020-06-26 stsp free(next_parent_path);
3629 3143d852 2020-06-25 stsp return err;
3632 abb4604f 2019-07-27 stsp static const struct got_error *
3633 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3634 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3635 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3636 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3637 f2a9dc41 2019-12-13 tracey int report_unchanged)
3639 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3640 6fc93f37 2019-12-13 stsp int fd = -1;
3641 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3642 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3643 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3644 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3646 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3648 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3649 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3650 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3652 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3653 6fc93f37 2019-12-13 stsp if (fd == -1) {
3654 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3655 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
3656 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3658 ff56836b 2021-07-08 stsp if (!no_ignores) {
3659 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3660 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3662 ff56836b 2021-07-08 stsp goto done;
3664 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3665 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3666 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3669 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3670 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3671 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3672 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3673 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3674 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3675 abb4604f 2019-07-27 stsp arg.status_path = path;
3676 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3677 abb4604f 2019-07-27 stsp arg.repo = repo;
3678 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3679 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3680 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3681 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3682 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3683 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3684 022fae89 2019-12-06 tracey if (!no_ignores) {
3685 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3686 3143d852 2020-06-25 stsp worktree->root_path, path);
3688 3143d852 2020-06-25 stsp goto done;
3690 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3691 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3692 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3695 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3696 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3697 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3698 927df6b7 2019-02-10 stsp free(ondisk_path);
3699 347d1d3e 2019-07-12 stsp return err;
3702 347d1d3e 2019-07-12 stsp const struct got_error *
3703 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3704 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3705 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3706 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3708 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3709 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3710 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3711 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3713 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3715 347d1d3e 2019-07-12 stsp return err;
3717 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3718 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3719 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3720 f6343036 2021-06-22 stsp no_ignores, 0);
3724 f8d1f275 2019-02-04 stsp free(fileindex_path);
3725 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3726 f8d1f275 2019-02-04 stsp return err;
3729 6c7ab921 2019-03-18 stsp const struct got_error *
3730 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3731 6c7ab921 2019-03-18 stsp const char *arg)
3733 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3734 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3735 6c7ab921 2019-03-18 stsp size_t len;
3736 00bb5ea0 2020-07-23 stsp struct stat sb;
3737 01740607 2020-11-04 stsp char *abspath = NULL;
3738 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3740 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3742 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3743 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3744 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3746 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3747 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3748 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3749 00bb5ea0 2020-07-23 stsp goto done;
3751 727173c3 2020-11-06 stsp sb.st_mode = 0;
3753 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3755 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3756 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3757 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3758 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3760 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3761 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3762 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3763 00bb5ea0 2020-07-23 stsp goto done;
3767 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3768 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3770 d0710d08 2019-07-22 stsp goto done;
3771 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3772 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3773 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3774 00bb5ea0 2020-07-23 stsp goto done;
3777 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3778 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3779 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3780 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3781 00bb5ea0 2020-07-23 stsp goto done;
3783 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3784 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3785 01740607 2020-11-04 stsp goto done;
3787 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3788 01740607 2020-11-04 stsp sizeof(canonpath));
3790 00bb5ea0 2020-07-23 stsp goto done;
3791 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3792 01740607 2020-11-04 stsp if (resolved == NULL) {
3793 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3794 01740607 2020-11-04 stsp goto done;
3799 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3800 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3801 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3802 6c7ab921 2019-03-18 stsp goto done;
3805 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3806 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3807 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3809 f6d88e1a 2019-05-29 stsp goto done;
3811 f6d88e1a 2019-05-29 stsp path = strdup("");
3812 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3813 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3814 f6d88e1a 2019-05-29 stsp goto done;
3818 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3819 6c7ab921 2019-03-18 stsp len = strlen(path);
3820 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3821 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3825 01740607 2020-11-04 stsp free(abspath);
3826 6c7ab921 2019-03-18 stsp free(resolved);
3827 d0710d08 2019-07-22 stsp free(cwd);
3828 6c7ab921 2019-03-18 stsp if (err == NULL)
3829 6c7ab921 2019-03-18 stsp *wt_path = path;
3831 6c7ab921 2019-03-18 stsp free(path);
3832 d00136be 2019-03-26 stsp return err;
3835 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3836 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3837 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3838 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3839 4e68cba3 2019-11-23 stsp void *progress_arg;
3840 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3843 4e68cba3 2019-11-23 stsp static const struct got_error *
3844 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3845 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3846 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3847 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3849 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3850 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3851 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3852 6d022e97 2019-08-04 stsp struct stat sb;
3853 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3855 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3856 dbb83fbd 2019-12-12 stsp relpath) == -1)
3857 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3859 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3861 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3862 12463d8b 2019-12-13 stsp de_name, a->repo);
3864 dbb83fbd 2019-12-12 stsp goto done;
3865 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3866 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3867 dbb83fbd 2019-12-12 stsp goto done;
3868 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3870 dbb83fbd 2019-12-12 stsp goto done;
3873 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3874 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3875 dbb83fbd 2019-12-12 stsp goto done;
3878 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3880 4e68cba3 2019-11-23 stsp goto done;
3881 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3882 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3883 3969253a 2020-03-07 stsp if (err) {
3884 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3885 3969253a 2020-03-07 stsp goto done;
3887 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3888 07f5b47a 2019-06-02 stsp if (err) {
3889 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3890 4e68cba3 2019-11-23 stsp goto done;
3893 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3895 dbb83fbd 2019-12-12 stsp return err;
3896 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3897 dbb83fbd 2019-12-12 stsp return NULL;
3898 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3901 d00136be 2019-03-26 stsp const struct got_error *
3902 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3903 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3904 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3905 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3907 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3908 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3909 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3910 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3911 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3913 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3915 d00136be 2019-03-26 stsp return err;
3917 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3919 d00136be 2019-03-26 stsp goto done;
3921 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3922 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3923 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3924 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3925 4e68cba3 2019-11-23 stsp saa.repo = repo;
3927 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3928 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3929 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3933 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3934 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3935 af12c6b9 2019-06-04 stsp err = sync_err;
3937 fb399478 2019-07-12 stsp free(fileindex_path);
3938 d00136be 2019-03-26 stsp if (fileindex)
3939 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3940 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3941 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3942 d00136be 2019-03-26 stsp err = unlockerr;
3943 6c7ab921 2019-03-18 stsp return err;
3946 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3947 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3948 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3949 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3950 f2a9dc41 2019-12-13 tracey void *progress_arg;
3951 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3952 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3953 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3954 766841c2 2020-08-13 stsp const char *status_codes;
3957 f2a9dc41 2019-12-13 tracey static const struct got_error *
3958 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3959 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3960 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3961 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3963 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3964 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3965 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3966 17ed4618 2019-06-02 stsp struct stat sb;
3967 20a2ad1c 2020-10-20 stsp char *ondisk_path;
3969 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3970 17ed4618 2019-06-02 stsp if (ie == NULL)
3971 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3973 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3974 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3975 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3976 9acbc4fa 2019-08-03 stsp return NULL;
3977 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3980 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3981 f2a9dc41 2019-12-13 tracey relpath) == -1)
3982 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3984 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3987 f2a9dc41 2019-12-13 tracey goto done;
3989 766841c2 2020-08-13 stsp if (a->status_codes) {
3990 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
3992 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
3993 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
3996 766841c2 2020-08-13 stsp if (i == ncodes) {
3997 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
3998 766841c2 2020-08-13 stsp free(ondisk_path);
3999 766841c2 2020-08-13 stsp return NULL;
4001 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4002 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4003 766841c2 2020-08-13 stsp static char msg[64];
4004 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4005 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4006 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4007 766841c2 2020-08-13 stsp goto done;
4011 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4012 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4013 f2a9dc41 2019-12-13 tracey goto done;
4014 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4015 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4016 f2a9dc41 2019-12-13 tracey goto done;
4018 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4019 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4020 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4021 f2a9dc41 2019-12-13 tracey goto done;
4025 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4026 20a2ad1c 2020-10-20 stsp size_t root_len;
4028 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4029 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4030 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4031 12463d8b 2019-12-13 stsp ondisk_path);
4032 12463d8b 2019-12-13 stsp goto done;
4034 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4035 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4036 12463d8b 2019-12-13 stsp goto done;
4039 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4041 20a2ad1c 2020-10-20 stsp char *parent;
4042 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4044 2513f20a 2020-10-20 stsp goto done;
4045 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4046 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4047 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4048 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4049 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4050 20a2ad1c 2020-10-20 stsp ondisk_path);
4053 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4054 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4057 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4059 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4060 f2a9dc41 2019-12-13 tracey if (err)
4061 f2a9dc41 2019-12-13 tracey return err;
4062 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4063 f2a9dc41 2019-12-13 tracey return NULL;
4064 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4065 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4068 2ec1f75b 2019-03-26 stsp const struct got_error *
4069 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4070 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4071 766841c2 2020-08-13 stsp const char *status_codes,
4072 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4073 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
4075 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4076 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4077 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4078 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4079 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4081 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4083 2ec1f75b 2019-03-26 stsp return err;
4085 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4087 2ec1f75b 2019-03-26 stsp goto done;
4089 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4090 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4091 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4092 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4093 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4094 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4095 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4096 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4098 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4099 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4100 62da3196 2021-10-01 stsp schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4104 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4105 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4106 af12c6b9 2019-06-04 stsp err = sync_err;
4108 fb399478 2019-07-12 stsp free(fileindex_path);
4109 2ec1f75b 2019-03-26 stsp if (fileindex)
4110 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4111 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4112 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4113 2ec1f75b 2019-03-26 stsp err = unlockerr;
4114 33aa809d 2019-08-08 stsp return err;
4117 33aa809d 2019-08-08 stsp static const struct got_error *
4118 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4120 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4121 33aa809d 2019-08-08 stsp char *line = NULL;
4122 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4123 33aa809d 2019-08-08 stsp ssize_t linelen;
4125 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4126 33aa809d 2019-08-08 stsp if (linelen == -1) {
4127 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4128 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4129 33aa809d 2019-08-08 stsp goto done;
4131 33aa809d 2019-08-08 stsp return NULL;
4133 33aa809d 2019-08-08 stsp if (outfile) {
4134 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4135 33aa809d 2019-08-08 stsp if (n != linelen) {
4136 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4137 33aa809d 2019-08-08 stsp goto done;
4140 33aa809d 2019-08-08 stsp if (rejectfile) {
4141 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4142 33aa809d 2019-08-08 stsp if (n != linelen)
4143 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4146 33aa809d 2019-08-08 stsp free(line);
4147 2ec1f75b 2019-03-26 stsp return err;
4150 33aa809d 2019-08-08 stsp static const struct got_error *
4151 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4153 33aa809d 2019-08-08 stsp char *line = NULL;
4154 33aa809d 2019-08-08 stsp size_t linesize = 0;
4155 33aa809d 2019-08-08 stsp ssize_t linelen;
4157 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4158 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4159 500467ff 2019-09-25 hiltjo if (ferror(f))
4160 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4161 500467ff 2019-09-25 hiltjo return NULL;
4163 33aa809d 2019-08-08 stsp free(line);
4164 33aa809d 2019-08-08 stsp return NULL;
4167 33aa809d 2019-08-08 stsp static const struct got_error *
4168 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4169 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4170 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4172 33aa809d 2019-08-08 stsp const struct got_error *err;
4174 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4175 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4176 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4178 33aa809d 2019-08-08 stsp return err;
4179 33aa809d 2019-08-08 stsp (*line_cur1)++;
4181 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4182 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4183 33aa809d 2019-08-08 stsp if (rejectfile)
4184 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4186 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4188 33aa809d 2019-08-08 stsp return err;
4189 33aa809d 2019-08-08 stsp (*line_cur2)++;
4191 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4192 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4193 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4195 33aa809d 2019-08-08 stsp return err;
4196 33aa809d 2019-08-08 stsp (*line_cur2)++;
4198 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4199 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4200 33aa809d 2019-08-08 stsp if (rejectfile)
4201 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4203 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4205 33aa809d 2019-08-08 stsp return err;
4206 33aa809d 2019-08-08 stsp (*line_cur1)++;
4209 f1e81a05 2019-08-10 stsp return NULL;
4212 f1e81a05 2019-08-10 stsp static const struct got_error *
4213 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4214 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4216 f1e81a05 2019-08-10 stsp const struct got_error *err;
4218 f1e81a05 2019-08-10 stsp if (outfile) {
4219 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4220 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4221 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4223 f1e81a05 2019-08-10 stsp return err;
4224 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4227 f1e81a05 2019-08-10 stsp if (rejectfile) {
4228 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4229 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4230 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4232 f1e81a05 2019-08-10 stsp return err;
4233 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4237 33aa809d 2019-08-08 stsp return NULL;
4240 33aa809d 2019-08-08 stsp static const struct got_error *
4241 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4242 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4243 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4244 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4245 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4247 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4248 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4249 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4250 33aa809d 2019-08-08 stsp FILE *hunkfile;
4251 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4252 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4255 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4257 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4258 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4259 fe621944 2020-11-10 stsp start_old = cc.left.start;
4260 fe621944 2020-11-10 stsp end_old = cc.left.end;
4261 fe621944 2020-11-10 stsp start_new = cc.right.start;
4262 fe621944 2020-11-10 stsp end_new = cc.right.end;
4264 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4265 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4266 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4268 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4269 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4270 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4272 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4273 fe621944 2020-11-10 stsp if (diff_state == NULL)
4274 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4275 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4277 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4278 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4279 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4280 33aa809d 2019-08-08 stsp goto done;
4283 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4284 fe621944 2020-11-10 stsp diff_result, &cc);
4285 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4286 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4287 33aa809d 2019-08-08 stsp goto done;
4290 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4291 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4292 33aa809d 2019-08-08 stsp goto done;
4295 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4296 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4298 33aa809d 2019-08-08 stsp goto done;
4300 33aa809d 2019-08-08 stsp switch (*choice) {
4301 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4302 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4303 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4305 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4306 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4307 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4309 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4312 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4316 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4317 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4318 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4319 33aa809d 2019-08-08 stsp return err;
4322 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4323 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4324 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4325 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4326 1f1abb7e 2019-08-08 stsp void *progress_arg;
4327 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4328 33aa809d 2019-08-08 stsp void *patch_arg;
4329 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4330 f259c4c1 2021-09-24 stsp int unlink_added_files;
4333 e20a8b6f 2019-06-04 stsp static const struct got_error *
4334 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4335 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4336 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4337 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4338 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4340 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4341 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4342 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4343 1ebedb77 2019-10-19 stsp int fd2 = -1;
4344 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4345 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4346 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4347 fe621944 2020-11-10 stsp struct stat sb2;
4348 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4349 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4350 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4352 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4354 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4356 33aa809d 2019-08-08 stsp return err;
4358 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4359 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4360 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4361 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4362 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4363 fa3cef63 2020-07-23 stsp goto done;
4365 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4366 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4367 fa3cef63 2020-07-23 stsp if (link_len == -1)
4368 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4369 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4370 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4373 8bd0cdad 2021-12-31 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4374 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4375 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4376 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4377 fa3cef63 2020-07-23 stsp goto done;
4379 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4380 fa3cef63 2020-07-23 stsp sizeof(link_target));
4381 fa3cef63 2020-07-23 stsp if (link_len == -1)
4382 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4383 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4384 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4387 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4388 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4389 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4390 fa3cef63 2020-07-23 stsp goto done;
4393 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4394 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4395 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4396 fa3cef63 2020-07-23 stsp goto done;
4401 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4402 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4403 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4404 fa3cef63 2020-07-23 stsp goto done;
4406 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4407 fa3cef63 2020-07-23 stsp if (n != link_len) {
4408 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4409 fa3cef63 2020-07-23 stsp goto done;
4411 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4412 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4413 fa3cef63 2020-07-23 stsp goto done;
4415 fa3cef63 2020-07-23 stsp rewind(f2);
4418 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4420 33aa809d 2019-08-08 stsp goto done;
4422 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4424 33aa809d 2019-08-08 stsp goto done;
4426 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4428 33aa809d 2019-08-08 stsp goto done;
4430 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4433 33aa809d 2019-08-08 stsp goto done;
4435 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4437 33aa809d 2019-08-08 stsp goto done;
4439 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4440 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4441 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4442 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4444 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4445 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4446 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4447 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4448 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4449 fe621944 2020-11-10 stsp nchanges++;
4451 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4452 33aa809d 2019-08-08 stsp int choice;
4453 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4454 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4455 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4456 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4457 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4458 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4460 33aa809d 2019-08-08 stsp goto done;
4461 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4462 33aa809d 2019-08-08 stsp have_content = 1;
4463 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4466 1ebedb77 2019-10-19 stsp if (have_content) {
4467 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4468 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4469 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4471 1ebedb77 2019-10-19 stsp goto done;
4473 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4474 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4475 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4476 fa3cef63 2020-07-23 stsp goto done;
4481 33aa809d 2019-08-08 stsp free(id_str);
4483 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4484 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4485 fe621944 2020-11-10 stsp if (err == NULL)
4486 fe621944 2020-11-10 stsp err = free_err;
4487 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4488 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4489 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4490 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4491 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4492 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4493 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4494 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4495 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4496 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4497 33aa809d 2019-08-08 stsp if (err || !have_content) {
4498 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4499 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4500 33aa809d 2019-08-08 stsp free(*path_outfile);
4501 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4503 33aa809d 2019-08-08 stsp free(path1);
4504 33aa809d 2019-08-08 stsp return err;
4507 33aa809d 2019-08-08 stsp static const struct got_error *
4508 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4509 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4510 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4511 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4513 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4514 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4515 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4516 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4517 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4518 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4519 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4520 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4521 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4522 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4524 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4525 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4526 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4527 d3bcc3d1 2019-08-08 stsp return NULL;
4529 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4530 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4531 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4533 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4534 65084dad 2019-08-08 stsp if (ie == NULL)
4535 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4537 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4538 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4539 a129376b 2019-03-28 stsp if (err) {
4540 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4541 a129376b 2019-03-28 stsp goto done;
4542 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4543 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4544 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4545 e20a8b6f 2019-06-04 stsp goto done;
4548 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4549 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4550 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4551 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4552 a129376b 2019-03-28 stsp goto done;
4555 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4556 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4557 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4558 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4559 a129376b 2019-03-28 stsp goto done;
4562 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4563 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4564 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4565 a129376b 2019-03-28 stsp goto done;
4570 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4571 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4572 a9fa2909 2019-07-27 stsp if (err) {
4573 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4574 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4575 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4576 a9fa2909 2019-07-27 stsp goto done;
4578 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4580 a9fa2909 2019-07-27 stsp goto done;
4582 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4584 a9fa2909 2019-07-27 stsp goto done;
4586 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4587 1233e6b6 2020-10-19 stsp free(te_name);
4588 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4589 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4590 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4591 a9fa2909 2019-07-27 stsp goto done;
4595 a129376b 2019-03-28 stsp switch (status) {
4596 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4597 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4598 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4599 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4600 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4602 33aa809d 2019-08-08 stsp goto done;
4603 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4606 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4607 1f1abb7e 2019-08-08 stsp ie->path);
4609 1ee397ad 2019-07-12 stsp goto done;
4610 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4611 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4612 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4613 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4614 f259c4c1 2021-09-24 stsp relpath) == -1) {
4615 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4616 f259c4c1 2021-09-24 stsp goto done;
4618 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4619 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4620 f259c4c1 2021-09-24 stsp ondisk_path);
4625 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4626 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4627 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4628 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4629 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4631 33aa809d 2019-08-08 stsp goto done;
4632 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4635 33aa809d 2019-08-08 stsp /* fall through */
4636 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4637 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4638 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4639 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4640 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4641 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4642 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4643 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4644 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4646 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4647 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4648 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4650 65084dad 2019-08-08 stsp goto done;
4652 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4653 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4654 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4655 a129376b 2019-03-28 stsp goto done;
4658 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4659 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4660 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4661 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4662 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4663 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4664 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4666 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4667 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4668 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4669 369fd7e5 2020-07-23 stsp path_content);
4672 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4673 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4674 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4675 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4677 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4678 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4679 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4680 369fd7e5 2020-07-23 stsp goto done;
4684 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4685 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4686 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4687 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4688 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4689 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4691 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4693 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4694 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4695 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4696 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4699 a129376b 2019-03-28 stsp goto done;
4700 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4701 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4702 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4703 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4704 437adc9d 2020-12-10 yzhong blob->id.sha1,
4705 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4707 2e1fa222 2020-07-23 stsp goto done;
4709 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4710 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4711 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4720 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4721 33aa809d 2019-08-08 stsp free(path_content);
4722 e20a8b6f 2019-06-04 stsp free(parent_path);
4723 a129376b 2019-03-28 stsp free(tree_path);
4725 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4727 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4728 a129376b 2019-03-28 stsp free(tree_id);
4729 e20a8b6f 2019-06-04 stsp return err;
4732 e20a8b6f 2019-06-04 stsp const struct got_error *
4733 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4734 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4735 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4736 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4737 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4739 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4740 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4741 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4742 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4743 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4744 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4746 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4748 e20a8b6f 2019-06-04 stsp return err;
4750 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4752 e20a8b6f 2019-06-04 stsp goto done;
4754 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4755 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4756 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4757 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4758 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4759 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4760 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4761 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4762 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4763 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4764 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
4768 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4769 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4770 e20a8b6f 2019-06-04 stsp err = sync_err;
4772 fb399478 2019-07-12 stsp free(fileindex_path);
4773 a129376b 2019-03-28 stsp if (fileindex)
4774 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4775 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4776 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4777 a129376b 2019-03-28 stsp err = unlockerr;
4778 c4296144 2019-05-09 stsp return err;
4781 cf066bf8 2019-05-09 stsp static void
4782 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4784 24519714 2019-05-09 stsp free(ct->path);
4785 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4786 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4787 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4788 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4789 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4790 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4794 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4795 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4796 24519714 2019-05-09 stsp struct got_repository *repo;
4797 24519714 2019-05-09 stsp struct got_worktree *worktree;
4798 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4799 5f8a88c6 2019-08-03 stsp int have_staged_files;
4800 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4803 c4296144 2019-05-09 stsp static const struct got_error *
4804 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4805 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4806 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4807 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4809 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4810 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4811 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4812 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4813 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4814 768aea60 2019-05-09 stsp struct stat sb;
4816 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4817 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4818 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4819 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4820 5f8a88c6 2019-08-03 stsp return NULL;
4822 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4823 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4825 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4826 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4827 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4828 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4829 5f8a88c6 2019-08-03 stsp return NULL;
4832 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4833 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4834 036813ee 2019-05-09 stsp goto done;
4836 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4837 036813ee 2019-05-09 stsp parent_path = strdup("");
4838 69960a46 2019-05-09 stsp if (parent_path == NULL)
4839 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4841 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4843 69960a46 2019-05-09 stsp return err;
4846 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4847 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4848 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4849 c4296144 2019-05-09 stsp goto done;
4852 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4853 768aea60 2019-05-09 stsp relpath) == -1) {
4854 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4855 768aea60 2019-05-09 stsp goto done;
4858 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4859 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4860 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4861 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4862 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4863 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4864 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4865 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4867 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4868 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4871 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4872 0aeb8099 2020-07-23 stsp goto done;
4874 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4875 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4876 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4877 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4878 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4879 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4880 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4881 12463d8b 2019-12-13 stsp ct->ondisk_path);
4882 12463d8b 2019-12-13 stsp goto done;
4884 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4885 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4886 768aea60 2019-05-09 stsp goto done;
4888 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4891 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4892 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4893 44d03001 2019-05-09 stsp relpath) == -1) {
4894 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4895 44d03001 2019-05-09 stsp goto done;
4898 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4899 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4900 35213c7c 2020-07-23 stsp int is_bad_symlink;
4901 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4902 35213c7c 2020-07-23 stsp ssize_t target_len;
4903 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4904 35213c7c 2020-07-23 stsp sizeof(target_path));
4905 35213c7c 2020-07-23 stsp if (target_len == -1) {
4906 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4907 35213c7c 2020-07-23 stsp ct->ondisk_path);
4908 35213c7c 2020-07-23 stsp goto done;
4910 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4911 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4913 35213c7c 2020-07-23 stsp goto done;
4914 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4915 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4916 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4917 35213c7c 2020-07-23 stsp goto done;
4922 cf066bf8 2019-05-09 stsp ct->status = status;
4923 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4924 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4925 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4926 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4927 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4928 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4929 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4930 b416585c 2019-05-13 stsp goto done;
4932 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4933 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4934 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4935 f0b75401 2019-08-03 stsp goto done;
4938 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4939 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4940 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4941 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4942 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4943 036813ee 2019-05-09 stsp goto done;
4946 24519714 2019-05-09 stsp ct->path = strdup(path);
4947 24519714 2019-05-09 stsp if (ct->path == NULL) {
4948 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4949 24519714 2019-05-09 stsp goto done;
4951 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4953 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4954 ed175427 2019-05-09 stsp free_commitable(ct);
4955 24519714 2019-05-09 stsp free(parent_path);
4956 036813ee 2019-05-09 stsp free(path);
4957 a129376b 2019-03-28 stsp return err;
4960 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4961 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4962 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4963 036813ee 2019-05-09 stsp struct got_repository *);
4965 ed175427 2019-05-09 stsp static const struct got_error *
4966 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4967 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4968 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4969 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4970 afa376bf 2019-05-09 stsp struct got_repository *repo)
4972 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4973 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4974 036813ee 2019-05-09 stsp char *subpath;
4976 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4977 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4978 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4980 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4982 ed175427 2019-05-09 stsp return err;
4984 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4985 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4986 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4987 036813ee 2019-05-09 stsp free(subpath);
4988 036813ee 2019-05-09 stsp return err;
4991 036813ee 2019-05-09 stsp static const struct got_error *
4992 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4994 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4995 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4997 036813ee 2019-05-09 stsp *match = 0;
4999 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5000 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5001 0f63689d 2019-05-10 stsp return NULL;
5004 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5006 0f63689d 2019-05-10 stsp return err;
5007 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5008 036813ee 2019-05-09 stsp free(ct_parent_path);
5009 036813ee 2019-05-09 stsp return err;
5012 768aea60 2019-05-09 stsp static mode_t
5013 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5015 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5016 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5018 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5021 036813ee 2019-05-09 stsp static const struct got_error *
5022 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5023 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5025 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5027 036813ee 2019-05-09 stsp *new_te = NULL;
5029 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5031 036813ee 2019-05-09 stsp goto done;
5033 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5035 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5036 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5037 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5039 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5041 036813ee 2019-05-09 stsp if (err && *new_te) {
5042 56e0773d 2019-11-28 stsp free(*new_te);
5043 036813ee 2019-05-09 stsp *new_te = NULL;
5045 036813ee 2019-05-09 stsp return err;
5048 036813ee 2019-05-09 stsp static const struct got_error *
5049 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5050 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5052 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5053 102b254e 2020-10-19 stsp char *ct_name = NULL;
5055 036813ee 2019-05-09 stsp *new_te = NULL;
5057 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5058 036813ee 2019-05-09 stsp if (*new_te == NULL)
5059 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5061 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5063 036813ee 2019-05-09 stsp goto done;
5064 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5065 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5066 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5067 036813ee 2019-05-09 stsp goto done;
5070 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5072 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5073 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5074 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5076 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5078 102b254e 2020-10-19 stsp free(ct_name);
5079 036813ee 2019-05-09 stsp if (err && *new_te) {
5080 56e0773d 2019-11-28 stsp free(*new_te);
5081 036813ee 2019-05-09 stsp *new_te = NULL;
5083 036813ee 2019-05-09 stsp return err;
5086 036813ee 2019-05-09 stsp static const struct got_error *
5087 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5088 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5090 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5091 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5093 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5095 036813ee 2019-05-09 stsp return err;
5096 036813ee 2019-05-09 stsp if (new_pe == NULL)
5097 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5098 036813ee 2019-05-09 stsp return NULL;
5101 afa376bf 2019-05-09 stsp static const struct got_error *
5102 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5103 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5105 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5106 5f8a88c6 2019-08-03 stsp unsigned char status;
5108 0ff8d236 2021-09-28 stsp if (status_cb == NULL) /* no commit progress output desired */
5109 0ff8d236 2021-09-28 stsp return NULL;
5111 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5112 afa376bf 2019-05-09 stsp ct_path++;
5114 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5115 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5117 5f8a88c6 2019-08-03 stsp status = ct->status;
5119 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5120 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5123 036813ee 2019-05-09 stsp static const struct got_error *
5124 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5125 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5127 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5128 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5129 44d03001 2019-05-09 stsp char *te_path;
5131 44d03001 2019-05-09 stsp *modified = 0;
5133 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5134 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5135 44d03001 2019-05-09 stsp te->name) == -1)
5136 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5138 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5139 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5140 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5141 44d03001 2019-05-09 stsp strlen(te_path));
5142 62d463ca 2020-10-20 naddy if (*modified)
5146 44d03001 2019-05-09 stsp free(te_path);
5147 44d03001 2019-05-09 stsp return err;
5150 44d03001 2019-05-09 stsp static const struct got_error *
5151 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5152 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5153 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5155 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5156 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5158 036813ee 2019-05-09 stsp *ctp = NULL;
5160 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5161 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5162 036813ee 2019-05-09 stsp char *ct_name = NULL;
5163 036813ee 2019-05-09 stsp int path_matches;
5165 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5166 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5167 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5168 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5171 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5172 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5176 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5179 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5181 036813ee 2019-05-09 stsp return err;
5182 036813ee 2019-05-09 stsp if (!path_matches)
5185 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5187 d34b633e 2020-10-19 stsp return err;
5189 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5190 d34b633e 2020-10-19 stsp free(ct_name);
5193 d34b633e 2020-10-19 stsp free(ct_name);
5195 036813ee 2019-05-09 stsp *ctp = ct;
5199 2b496619 2019-07-10 stsp return err;
5202 2b496619 2019-07-10 stsp static const struct got_error *
5203 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5204 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5205 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5206 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5207 2b496619 2019-07-10 stsp struct got_repository *repo)
5209 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5210 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5211 2b496619 2019-07-10 stsp char *subtree_path;
5212 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5213 ba580f68 2020-03-22 stsp int nentries;
5215 2b496619 2019-07-10 stsp *new_tep = NULL;
5217 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5218 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5219 2b496619 2019-07-10 stsp child_path) == -1)
5220 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5222 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5223 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5224 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5225 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5227 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5228 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5229 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5230 2b496619 2019-07-10 stsp goto done;
5232 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5233 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5234 2b496619 2019-07-10 stsp if (err) {
5235 56e0773d 2019-11-28 stsp free(new_te);
5236 2b496619 2019-07-10 stsp goto done;
5238 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5241 2b496619 2019-07-10 stsp free(subtree_path);
5242 2b496619 2019-07-10 stsp if (err == NULL)
5243 2b496619 2019-07-10 stsp *new_tep = new_te;
5244 036813ee 2019-05-09 stsp return err;
5247 036813ee 2019-05-09 stsp static const struct got_error *
5248 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5249 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5250 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5251 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5252 036813ee 2019-05-09 stsp struct got_repository *repo)
5254 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5255 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5256 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5257 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5259 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5260 ba580f68 2020-03-22 stsp *nentries = 0;
5262 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5263 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5264 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5265 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5267 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5268 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5269 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5272 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5273 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5276 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5277 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5279 036813ee 2019-05-09 stsp goto done;
5281 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5282 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5283 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5285 036813ee 2019-05-09 stsp goto done;
5286 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5288 afa376bf 2019-05-09 stsp goto done;
5289 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5290 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5292 2f51b5b3 2019-05-09 stsp goto done;
5293 ba580f68 2020-03-22 stsp (*nentries)++;
5295 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5296 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5297 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5298 2b496619 2019-07-10 stsp == NULL) {
5299 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5300 2b496619 2019-07-10 stsp child_path, path_base_tree,
5301 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5304 2b496619 2019-07-10 stsp goto done;
5305 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5307 2b496619 2019-07-10 stsp goto done;
5308 ba580f68 2020-03-22 stsp (*nentries)++;
5313 2f51b5b3 2019-05-09 stsp if (base_tree) {
5314 56e0773d 2019-11-28 stsp int i, nbase_entries;
5315 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5316 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5317 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5318 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5320 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5321 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5322 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5323 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5325 63c5ca5d 2019-08-24 stsp goto done;
5326 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5328 63c5ca5d 2019-08-24 stsp goto done;
5329 ba580f68 2020-03-22 stsp (*nentries)++;
5333 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5334 44d03001 2019-05-09 stsp int modified;
5335 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5337 036813ee 2019-05-09 stsp goto done;
5338 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5339 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5341 2f51b5b3 2019-05-09 stsp goto done;
5342 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5343 44d03001 2019-05-09 stsp if (modified) {
5344 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5345 ba580f68 2020-03-22 stsp int nsubentries;
5346 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5347 ba580f68 2020-03-22 stsp &nsubentries, te,
5348 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5349 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5351 44d03001 2019-05-09 stsp goto done;
5352 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5353 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5354 ba580f68 2020-03-22 stsp free(new_id);
5357 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5358 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5359 56e0773d 2019-11-28 stsp free(new_id);
5361 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5363 036813ee 2019-05-09 stsp goto done;
5364 ba580f68 2020-03-22 stsp (*nentries)++;
5368 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5369 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5371 f66c734c 2019-09-22 stsp goto done;
5373 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5374 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5375 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5376 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5377 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5378 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5380 2f51b5b3 2019-05-09 stsp goto done;
5381 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5383 2f51b5b3 2019-05-09 stsp goto done;
5384 ba580f68 2020-03-22 stsp (*nentries)++;
5386 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5387 b416585c 2019-05-13 stsp status_arg);
5389 afa376bf 2019-05-09 stsp goto done;
5391 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5392 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5394 2f51b5b3 2019-05-09 stsp goto done;
5395 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5397 2f51b5b3 2019-05-09 stsp goto done;
5398 ba580f68 2020-03-22 stsp (*nentries)++;
5403 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5404 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5406 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5407 2e1fa222 2020-07-23 stsp return err;
5410 2e1fa222 2020-07-23 stsp static const struct got_error *
5411 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5412 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5413 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5414 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5416 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5417 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5418 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5420 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5421 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5422 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5424 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5426 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5427 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5428 437adc9d 2020-12-10 yzhong if (err)
5429 437adc9d 2020-12-10 yzhong goto done;
5432 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5433 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5434 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5435 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5436 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5437 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5438 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5439 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5441 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5442 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5443 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5444 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5445 72fd46fa 2019-09-06 stsp !have_staged_files);
5447 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5448 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5449 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5450 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5451 72fd46fa 2019-09-06 stsp !have_staged_files);
5453 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5455 437adc9d 2020-12-10 yzhong goto done;
5456 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5457 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5458 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5459 3969253a 2020-03-07 stsp if (err) {
5460 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5461 437adc9d 2020-12-10 yzhong goto done;
5463 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5464 3969253a 2020-03-07 stsp if (err) {
5465 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5466 437adc9d 2020-12-10 yzhong goto done;
5469 437adc9d 2020-12-10 yzhong free(relpath);
5470 437adc9d 2020-12-10 yzhong relpath = NULL;
5473 437adc9d 2020-12-10 yzhong free(relpath);
5474 d56d26ce 2019-05-10 stsp return err;
5478 d56d26ce 2019-05-10 stsp static const struct got_error *
5479 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5480 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5481 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5482 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5483 735ef5ac 2019-08-03 stsp int ood_errcode)
5485 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5486 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5488 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5489 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5490 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5491 1a36436d 2019-06-10 stsp return NULL;
5493 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5494 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5496 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5497 735ef5ac 2019-08-03 stsp in_repo_path);
5498 9bead371 2019-07-28 stsp if (err) {
5499 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5500 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5501 1a36436d 2019-06-10 stsp goto done;
5502 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5503 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5505 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5506 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5507 735ef5ac 2019-08-03 stsp in_repo_path);
5508 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5509 1a36436d 2019-06-10 stsp goto done;
5510 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5514 1a36436d 2019-06-10 stsp return err;
5517 c4296144 2019-05-09 stsp const struct got_error *
5518 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5519 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5520 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5521 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5522 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5523 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5524 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5525 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5526 afa376bf 2019-05-09 stsp struct got_repository *repo)
5528 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5529 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5530 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5531 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5532 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5533 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5534 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5535 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5536 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5537 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5538 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5539 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5541 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5543 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5545 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5547 588edf97 2019-05-10 stsp goto done;
5549 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5551 588edf97 2019-05-10 stsp goto done;
5553 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5554 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5559 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5560 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5564 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5565 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5566 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5567 cf066bf8 2019-05-09 stsp char *ondisk_path;
5569 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5570 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5571 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5574 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5575 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5576 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5579 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5580 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5581 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5582 cf066bf8 2019-05-09 stsp goto done;
5584 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5585 2e1fa222 2020-07-23 stsp free(ondisk_path);
5587 cf066bf8 2019-05-09 stsp goto done;
5590 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5591 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5592 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5594 036813ee 2019-05-09 stsp goto done;
5596 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5598 de18fc63 2019-05-09 stsp goto done;
5599 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5600 f259c4c1 2021-09-24 stsp nparents++;
5601 f259c4c1 2021-09-24 stsp if (parent_id2) {
5602 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
5604 f259c4c1 2021-09-24 stsp goto done;
5605 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5606 f259c4c1 2021-09-24 stsp nparents++;
5608 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5609 f259c4c1 2021-09-24 stsp nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5610 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5611 33ad4cbe 2019-05-12 jcs free(logmsg);
5613 9d40349a 2019-05-09 stsp goto done;
5615 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5616 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5617 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5618 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5619 09f5bd90 2019-05-09 stsp goto done;
5621 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5622 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5624 09f5bd90 2019-05-09 stsp goto done;
5625 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5627 ebf99748 2019-05-09 stsp goto done;
5628 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5629 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5630 09f5bd90 2019-05-09 stsp goto done;
5632 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5633 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5635 f2c16586 2019-05-09 stsp goto done;
5636 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5638 f2c16586 2019-05-09 stsp goto done;
5640 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5642 09f5bd90 2019-05-09 stsp goto done;
5644 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5646 ebf99748 2019-05-09 stsp goto done;
5648 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
5649 588edf97 2019-05-10 stsp if (head_tree)
5650 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5651 588edf97 2019-05-10 stsp if (head_commit)
5652 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5653 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5654 2f17228e 2019-05-12 stsp if (head_ref2) {
5655 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5656 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5657 2f17228e 2019-05-12 stsp err = unlockerr;
5658 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5660 39cd0ff6 2019-07-12 stsp return err;
5663 5c1e53bc 2019-07-28 stsp static const struct got_error *
5664 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5665 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5667 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5668 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5670 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5671 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5672 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5674 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5675 5c1e53bc 2019-07-28 stsp ct_path++;
5677 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5678 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5682 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5683 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5685 5c1e53bc 2019-07-28 stsp return NULL;
5688 f0b75401 2019-08-03 stsp static const struct got_error *
5689 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5691 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5693 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5694 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5695 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5698 f0b75401 2019-08-03 stsp return NULL;
5701 5f8a88c6 2019-08-03 stsp static const struct got_error *
5702 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5703 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5705 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5706 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5708 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5709 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5711 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5712 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5713 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5714 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5715 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5716 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5719 5f8a88c6 2019-08-03 stsp return NULL;
5722 39cd0ff6 2019-07-12 stsp const struct got_error *
5723 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5724 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5725 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5726 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5727 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5728 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5730 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5731 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5732 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5733 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5734 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5735 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5736 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5737 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5738 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5740 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5742 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5744 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5746 39cd0ff6 2019-07-12 stsp goto done;
5748 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5750 39cd0ff6 2019-07-12 stsp goto done;
5752 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5754 39cd0ff6 2019-07-12 stsp goto done;
5756 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5758 39cd0ff6 2019-07-12 stsp goto done;
5760 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5761 5f8a88c6 2019-08-03 stsp &have_staged_files);
5762 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5763 5f8a88c6 2019-08-03 stsp goto done;
5764 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5765 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5767 5f8a88c6 2019-08-03 stsp goto done;
5770 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5771 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5772 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5773 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5774 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5775 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5776 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5777 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5778 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
5780 5c1e53bc 2019-07-28 stsp goto done;
5783 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5784 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5785 39cd0ff6 2019-07-12 stsp goto done;
5788 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5789 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5791 5c1e53bc 2019-07-28 stsp goto done;
5794 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5795 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5796 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5798 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5799 f0b75401 2019-08-03 stsp ct_path++;
5800 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5801 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5802 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5804 b50cabdf 2019-07-12 stsp goto done;
5808 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5809 f259c4c1 2021-09-24 stsp head_commit_id, NULL, worktree, author, committer,
5810 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5812 39cd0ff6 2019-07-12 stsp goto done;
5814 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5815 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5816 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5817 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5818 39cd0ff6 2019-07-12 stsp err = sync_err;
5820 39cd0ff6 2019-07-12 stsp if (fileindex)
5821 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5822 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5823 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5824 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5825 39cd0ff6 2019-07-12 stsp err = unlockerr;
5826 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5827 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5828 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5830 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5831 c4296144 2019-05-09 stsp return err;
5834 8656d6c4 2019-05-20 stsp const char *
5835 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5837 8656d6c4 2019-05-20 stsp return ct->path;
5840 8656d6c4 2019-05-20 stsp unsigned int
5841 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5843 8656d6c4 2019-05-20 stsp return ct->status;
5846 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5847 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5848 818c7501 2019-07-11 stsp struct got_repository *repo;
5851 818c7501 2019-07-11 stsp static const struct got_error *
5852 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5854 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5855 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5856 818c7501 2019-07-11 stsp unsigned char status;
5857 818c7501 2019-07-11 stsp struct stat sb;
5858 818c7501 2019-07-11 stsp char *ondisk_path;
5860 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5861 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5862 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5863 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5865 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5867 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5869 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5870 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5871 818c7501 2019-07-11 stsp free(ondisk_path);
5873 818c7501 2019-07-11 stsp return err;
5875 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5876 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5877 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5878 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5880 818c7501 2019-07-11 stsp return NULL;
5883 818c7501 2019-07-11 stsp const struct got_error *
5884 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5885 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5886 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5887 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5889 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5890 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5891 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5892 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5893 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5894 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5895 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5897 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5898 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5899 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5901 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5903 818c7501 2019-07-11 stsp return err;
5905 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5907 818c7501 2019-07-11 stsp goto done;
5909 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5910 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5911 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5914 818c7501 2019-07-11 stsp goto done;
5916 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5918 818c7501 2019-07-11 stsp goto done;
5920 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5922 818c7501 2019-07-11 stsp goto done;
5924 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5926 818c7501 2019-07-11 stsp goto done;
5928 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5931 e51d7b55 2020-01-04 stsp goto done;
5933 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5935 818c7501 2019-07-11 stsp goto done;
5936 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5937 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5938 e51d7b55 2020-01-04 stsp goto done;
5941 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5942 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5944 818c7501 2019-07-11 stsp goto done;
5945 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5947 818c7501 2019-07-11 stsp goto done;
5949 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5951 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5953 818c7501 2019-07-11 stsp goto done;
5955 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5957 818c7501 2019-07-11 stsp goto done;
5959 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5960 818c7501 2019-07-11 stsp worktree->base_commit_id);
5962 818c7501 2019-07-11 stsp goto done;
5963 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5965 818c7501 2019-07-11 stsp goto done;
5967 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5969 818c7501 2019-07-11 stsp goto done;
5971 818c7501 2019-07-11 stsp free(fileindex_path);
5972 818c7501 2019-07-11 stsp free(tmp_branch_name);
5973 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5974 818c7501 2019-07-11 stsp free(branch_ref_name);
5975 818c7501 2019-07-11 stsp if (branch_ref)
5976 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5977 818c7501 2019-07-11 stsp if (wt_branch)
5978 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5979 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5980 818c7501 2019-07-11 stsp if (err) {
5981 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5982 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5983 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5985 818c7501 2019-07-11 stsp if (*tmp_branch) {
5986 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5987 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5989 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5990 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5991 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5993 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5995 818c7501 2019-07-11 stsp return err;
5998 818c7501 2019-07-11 stsp const struct got_error *
5999 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6000 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6001 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6002 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6004 818c7501 2019-07-11 stsp const struct got_error *err;
6005 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6006 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6007 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6008 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6009 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6011 818c7501 2019-07-11 stsp *commit_id = NULL;
6012 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6013 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6014 3e3a69f1 2019-07-25 stsp *branch = NULL;
6015 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6017 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6019 3e3a69f1 2019-07-25 stsp return err;
6021 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6023 f032f1f7 2019-08-04 stsp goto done;
6025 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6026 f032f1f7 2019-08-04 stsp &have_staged_files);
6027 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6028 f032f1f7 2019-08-04 stsp goto done;
6029 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6030 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6031 3e3a69f1 2019-07-25 stsp goto done;
6034 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6036 f032f1f7 2019-08-04 stsp goto done;
6038 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6040 818c7501 2019-07-11 stsp goto done;
6042 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6044 818c7501 2019-07-11 stsp goto done;
6046 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6048 818c7501 2019-07-11 stsp goto done;
6050 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6052 818c7501 2019-07-11 stsp goto done;
6054 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6055 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6057 818c7501 2019-07-11 stsp goto done;
6059 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6061 818c7501 2019-07-11 stsp goto done;
6063 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6065 818c7501 2019-07-11 stsp goto done;
6067 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6068 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6070 818c7501 2019-07-11 stsp goto done;
6072 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6074 818c7501 2019-07-11 stsp goto done;
6076 818c7501 2019-07-11 stsp free(commit_ref_name);
6077 818c7501 2019-07-11 stsp free(branch_ref_name);
6078 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6079 818c7501 2019-07-11 stsp if (commit_ref)
6080 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6081 818c7501 2019-07-11 stsp if (branch_ref)
6082 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6083 818c7501 2019-07-11 stsp if (err) {
6084 818c7501 2019-07-11 stsp free(*commit_id);
6085 818c7501 2019-07-11 stsp *commit_id = NULL;
6086 818c7501 2019-07-11 stsp if (*tmp_branch) {
6087 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6088 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6090 818c7501 2019-07-11 stsp if (*new_base_branch) {
6091 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6092 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6094 818c7501 2019-07-11 stsp if (*branch) {
6095 818c7501 2019-07-11 stsp got_ref_close(*branch);
6096 818c7501 2019-07-11 stsp *branch = NULL;
6098 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6099 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6100 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6102 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6104 818c7501 2019-07-11 stsp return err;
6107 818c7501 2019-07-11 stsp const struct got_error *
6108 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6110 818c7501 2019-07-11 stsp const struct got_error *err;
6111 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6113 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6115 818c7501 2019-07-11 stsp return err;
6117 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6118 818c7501 2019-07-11 stsp free(tmp_branch_name);
6119 818c7501 2019-07-11 stsp return NULL;
6122 818c7501 2019-07-11 stsp static const struct got_error *
6123 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6124 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6126 0ebf8283 2019-07-24 stsp *logmsg = arg;
6127 818c7501 2019-07-11 stsp return NULL;
6130 818c7501 2019-07-11 stsp static const struct got_error *
6131 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6132 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6133 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6134 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6136 818c7501 2019-07-11 stsp return NULL;
6139 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6140 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6141 01757395 2019-07-12 stsp void *progress_arg;
6142 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6145 01757395 2019-07-12 stsp static const struct got_error *
6146 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6148 01757395 2019-07-12 stsp const struct got_error *err;
6149 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6151 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6153 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6155 01757395 2019-07-12 stsp return err;
6157 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6158 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6159 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6160 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6161 01757395 2019-07-12 stsp return NULL;
6163 01757395 2019-07-12 stsp p = strdup(path);
6164 01757395 2019-07-12 stsp if (p == NULL)
6165 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6167 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6168 01757395 2019-07-12 stsp if (err || new == NULL)
6170 01757395 2019-07-12 stsp return err;
6174 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6176 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6178 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6179 01757395 2019-07-12 stsp free((char *)pe->path);
6181 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6184 0ebf8283 2019-07-24 stsp static const struct got_error *
6185 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6186 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6188 818c7501 2019-07-11 stsp const struct got_error *err;
6189 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6191 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6192 818c7501 2019-07-11 stsp if (err) {
6193 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6194 818c7501 2019-07-11 stsp goto done;
6195 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6197 818c7501 2019-07-11 stsp goto done;
6198 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6200 818c7501 2019-07-11 stsp goto done;
6201 de05890f 2020-03-05 stsp } else if (is_rebase) {
6202 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6205 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6207 818c7501 2019-07-11 stsp goto done;
6208 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6209 818c7501 2019-07-11 stsp free(stored_id);
6210 818c7501 2019-07-11 stsp if (cmp != 0) {
6211 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6212 818c7501 2019-07-11 stsp goto done;
6216 0ebf8283 2019-07-24 stsp if (commit_ref)
6217 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6218 0ebf8283 2019-07-24 stsp return err;
6221 0ebf8283 2019-07-24 stsp static const struct got_error *
6222 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6223 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6224 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6225 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6226 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6227 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6229 0ebf8283 2019-07-24 stsp const struct got_error *err;
6230 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6231 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6232 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6234 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6236 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6238 0ebf8283 2019-07-24 stsp return err;
6240 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6241 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6242 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6243 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6244 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6245 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6246 818c7501 2019-07-11 stsp if (commit_ref)
6247 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6248 818c7501 2019-07-11 stsp return err;
6251 818c7501 2019-07-11 stsp const struct got_error *
6252 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6253 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6254 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6255 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6256 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6257 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6259 0ebf8283 2019-07-24 stsp const struct got_error *err;
6260 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6262 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6264 0ebf8283 2019-07-24 stsp return err;
6266 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6268 0ebf8283 2019-07-24 stsp goto done;
6270 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6271 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6272 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6274 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6275 0ebf8283 2019-07-24 stsp return err;
6278 0ebf8283 2019-07-24 stsp const struct got_error *
6279 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6280 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6281 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6282 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6283 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6284 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6286 0ebf8283 2019-07-24 stsp const struct got_error *err;
6287 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6289 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6291 0ebf8283 2019-07-24 stsp return err;
6293 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6295 0ebf8283 2019-07-24 stsp goto done;
6297 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6298 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6299 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6301 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6302 0ebf8283 2019-07-24 stsp return err;
6305 0ebf8283 2019-07-24 stsp static const struct got_error *
6306 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6307 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6308 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6309 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6310 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6312 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6313 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6314 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6315 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6316 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6317 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6318 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6320 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6321 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6323 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6325 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6327 3e3a69f1 2019-07-25 stsp return err;
6329 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6330 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6331 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6332 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6334 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6335 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6337 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6338 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6339 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6340 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6341 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6342 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6344 01757395 2019-07-12 stsp if (merged_paths) {
6345 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6346 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6347 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6348 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6351 01757395 2019-07-12 stsp goto done;
6354 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6355 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6357 01757395 2019-07-12 stsp goto done;
6360 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6361 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6362 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6364 a0e95631 2019-07-12 stsp goto done;
6365 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6366 a0e95631 2019-07-12 stsp goto done;
6369 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6371 edd02c5e 2019-07-11 stsp goto done;
6373 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6375 818c7501 2019-07-11 stsp goto done;
6377 5943eee2 2019-08-13 stsp if (new_logmsg) {
6378 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6379 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6380 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6381 5943eee2 2019-08-13 stsp goto done;
6384 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6386 5943eee2 2019-08-13 stsp goto done;
6389 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6390 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6391 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6392 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6393 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6395 a0e95631 2019-07-12 stsp goto done;
6397 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6399 a0e95631 2019-07-12 stsp goto done;
6401 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6403 a0e95631 2019-07-12 stsp goto done;
6405 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6406 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6407 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6408 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6409 a0e95631 2019-07-12 stsp err = sync_err;
6411 a0e95631 2019-07-12 stsp free(fileindex_path);
6412 a0e95631 2019-07-12 stsp free(head_commit_id);
6413 a0e95631 2019-07-12 stsp if (head_ref)
6414 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6415 818c7501 2019-07-11 stsp if (err) {
6416 818c7501 2019-07-11 stsp free(*new_commit_id);
6417 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6419 818c7501 2019-07-11 stsp return err;
6422 818c7501 2019-07-11 stsp const struct got_error *
6423 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6424 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6425 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6426 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6427 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6429 0ebf8283 2019-07-24 stsp const struct got_error *err;
6430 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6431 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6432 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6434 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6436 0ebf8283 2019-07-24 stsp return err;
6438 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6440 0ebf8283 2019-07-24 stsp goto done;
6441 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6443 0ebf8283 2019-07-24 stsp goto done;
6444 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6445 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6446 0ebf8283 2019-07-24 stsp goto done;
6449 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6450 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6452 0ebf8283 2019-07-24 stsp if (commit_ref)
6453 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6454 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6455 0ebf8283 2019-07-24 stsp free(commit_id);
6456 0ebf8283 2019-07-24 stsp return err;
6459 0ebf8283 2019-07-24 stsp const struct got_error *
6460 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6461 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6462 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6463 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6464 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6465 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6467 0ebf8283 2019-07-24 stsp const struct got_error *err;
6468 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6469 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6471 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6473 0ebf8283 2019-07-24 stsp return err;
6475 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6477 0ebf8283 2019-07-24 stsp goto done;
6479 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6480 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6482 0ebf8283 2019-07-24 stsp if (commit_ref)
6483 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6484 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6485 0ebf8283 2019-07-24 stsp return err;
6488 0ebf8283 2019-07-24 stsp const struct got_error *
6489 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6490 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6492 3e3a69f1 2019-07-25 stsp if (fileindex)
6493 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6494 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6497 69844fba 2019-07-11 stsp static const struct got_error *
6498 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6500 69844fba 2019-07-11 stsp const struct got_error *err;
6501 69844fba 2019-07-11 stsp struct got_reference *ref;
6503 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6504 69844fba 2019-07-11 stsp if (err) {
6505 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6506 69844fba 2019-07-11 stsp return NULL;
6507 69844fba 2019-07-11 stsp return err;
6510 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6511 69844fba 2019-07-11 stsp got_ref_close(ref);
6512 69844fba 2019-07-11 stsp return err;
6515 69844fba 2019-07-11 stsp static const struct got_error *
6516 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6518 69844fba 2019-07-11 stsp const struct got_error *err;
6519 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6520 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6522 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6524 69844fba 2019-07-11 stsp goto done;
6525 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6527 69844fba 2019-07-11 stsp goto done;
6529 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6531 69844fba 2019-07-11 stsp goto done;
6532 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6534 69844fba 2019-07-11 stsp goto done;
6536 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6538 69844fba 2019-07-11 stsp goto done;
6539 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6541 69844fba 2019-07-11 stsp goto done;
6543 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6545 69844fba 2019-07-11 stsp goto done;
6546 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6548 69844fba 2019-07-11 stsp goto done;
6551 69844fba 2019-07-11 stsp free(tmp_branch_name);
6552 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6553 69844fba 2019-07-11 stsp free(branch_ref_name);
6554 69844fba 2019-07-11 stsp free(commit_ref_name);
6555 e600f124 2021-03-21 stsp return err;
6558 e600f124 2021-03-21 stsp const struct got_error *
6559 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6560 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6562 e600f124 2021-03-21 stsp const struct got_error *err;
6563 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6564 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6565 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6566 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6567 e600f124 2021-03-21 stsp char *refname = NULL;
6569 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6570 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6571 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6572 e600f124 2021-03-21 stsp branch_name += 11;
6574 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6576 e600f124 2021-03-21 stsp return err;
6578 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6579 e600f124 2021-03-21 stsp new_id_str) == -1) {
6580 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6581 e600f124 2021-03-21 stsp goto done;
6584 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6586 e600f124 2021-03-21 stsp goto done;
6588 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6590 e600f124 2021-03-21 stsp goto done;
6592 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6594 e600f124 2021-03-21 stsp free(new_id_str);
6595 e600f124 2021-03-21 stsp free(refname);
6596 e600f124 2021-03-21 stsp free(old_commit_id);
6598 e600f124 2021-03-21 stsp got_ref_close(ref);
6599 69844fba 2019-07-11 stsp return err;
6602 818c7501 2019-07-11 stsp const struct got_error *
6603 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6604 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6605 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6606 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6608 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6609 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6610 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6612 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6614 818c7501 2019-07-11 stsp return err;
6616 e600f124 2021-03-21 stsp if (create_backup) {
6617 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6618 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6620 e600f124 2021-03-21 stsp goto done;
6623 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6625 818c7501 2019-07-11 stsp goto done;
6627 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6629 818c7501 2019-07-11 stsp goto done;
6631 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6633 818c7501 2019-07-11 stsp goto done;
6635 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6637 a615e0e7 2020-12-16 stsp goto done;
6639 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6641 a615e0e7 2020-12-16 stsp goto done;
6642 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6643 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6644 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6645 a615e0e7 2020-12-16 stsp err = sync_err;
6647 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6648 a615e0e7 2020-12-16 stsp free(fileindex_path);
6649 818c7501 2019-07-11 stsp free(new_head_commit_id);
6650 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6651 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6652 818c7501 2019-07-11 stsp err = unlockerr;
6653 818c7501 2019-07-11 stsp return err;
6656 818c7501 2019-07-11 stsp const struct got_error *
6657 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6658 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6659 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6660 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6662 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6663 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6664 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6665 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6666 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6667 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6669 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6671 818c7501 2019-07-11 stsp return err;
6673 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6674 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6676 818c7501 2019-07-11 stsp goto done;
6678 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6680 818c7501 2019-07-11 stsp goto done;
6683 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6684 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6685 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6687 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6689 818c7501 2019-07-11 stsp goto done;
6691 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6693 818c7501 2019-07-11 stsp goto done;
6695 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6696 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6698 ca355955 2019-07-12 stsp goto done;
6700 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6702 ca355955 2019-07-12 stsp goto done;
6704 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6706 818c7501 2019-07-11 stsp goto done;
6708 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6709 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6710 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6711 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6712 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6713 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6714 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6715 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
6716 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6717 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
6719 1f1abb7e 2019-08-08 stsp goto sync;
6721 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6722 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6724 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6725 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6726 ca355955 2019-07-12 stsp err = sync_err;
6728 818c7501 2019-07-11 stsp got_ref_close(resolved);
6729 a3a2faf2 2019-07-12 stsp free(tree_id);
6730 818c7501 2019-07-11 stsp free(commit_id);
6731 0ebf8283 2019-07-24 stsp if (fileindex)
6732 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6733 0ebf8283 2019-07-24 stsp free(fileindex_path);
6735 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6736 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6737 0ebf8283 2019-07-24 stsp err = unlockerr;
6738 0ebf8283 2019-07-24 stsp return err;
6741 0ebf8283 2019-07-24 stsp const struct got_error *
6742 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6743 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6744 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6745 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6747 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6748 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6749 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6750 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6751 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6752 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6753 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6754 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6756 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6757 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6758 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6759 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6761 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6763 0ebf8283 2019-07-24 stsp return err;
6765 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6767 0ebf8283 2019-07-24 stsp goto done;
6769 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6770 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6771 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6774 0ebf8283 2019-07-24 stsp goto done;
6776 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6778 0ebf8283 2019-07-24 stsp goto done;
6780 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6782 0ebf8283 2019-07-24 stsp goto done;
6784 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6785 0ebf8283 2019-07-24 stsp worktree);
6787 0ebf8283 2019-07-24 stsp goto done;
6789 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6792 0ebf8283 2019-07-24 stsp goto done;
6794 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6796 0ebf8283 2019-07-24 stsp goto done;
6798 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6800 0ebf8283 2019-07-24 stsp goto done;
6802 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6803 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6805 0ebf8283 2019-07-24 stsp goto done;
6806 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6808 0ebf8283 2019-07-24 stsp goto done;
6809 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6810 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6811 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6812 0ebf8283 2019-07-24 stsp goto done;
6815 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6816 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6818 0ebf8283 2019-07-24 stsp goto done;
6819 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6821 0ebf8283 2019-07-24 stsp goto done;
6823 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6825 0ebf8283 2019-07-24 stsp goto done;
6827 0ebf8283 2019-07-24 stsp free(fileindex_path);
6828 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6829 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6830 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6831 0ebf8283 2019-07-24 stsp if (wt_branch)
6832 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6833 0ebf8283 2019-07-24 stsp if (err) {
6834 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6835 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6836 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6838 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6839 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6840 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6842 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6843 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6844 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6845 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6847 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6849 0ebf8283 2019-07-24 stsp return err;
6852 0ebf8283 2019-07-24 stsp const struct got_error *
6853 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6854 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6856 3e3a69f1 2019-07-25 stsp if (fileindex)
6857 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6858 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6861 0ebf8283 2019-07-24 stsp const struct got_error *
6862 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6863 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6865 0ebf8283 2019-07-24 stsp const struct got_error *err;
6866 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6868 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6870 0ebf8283 2019-07-24 stsp return err;
6872 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6873 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6874 0ebf8283 2019-07-24 stsp return NULL;
6877 0ebf8283 2019-07-24 stsp const struct got_error *
6878 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6879 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6880 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6881 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6883 0ebf8283 2019-07-24 stsp const struct got_error *err;
6884 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6885 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6886 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6887 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6888 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6889 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6891 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6892 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6893 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6894 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6896 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6898 3e3a69f1 2019-07-25 stsp return err;
6900 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6902 f032f1f7 2019-08-04 stsp goto done;
6904 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6905 f032f1f7 2019-08-04 stsp &have_staged_files);
6906 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6907 f032f1f7 2019-08-04 stsp goto done;
6908 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6909 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6910 3e3a69f1 2019-07-25 stsp goto done;
6913 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6915 f032f1f7 2019-08-04 stsp goto done;
6917 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6919 0ebf8283 2019-07-24 stsp goto done;
6921 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6923 0ebf8283 2019-07-24 stsp goto done;
6925 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6926 0ebf8283 2019-07-24 stsp worktree);
6928 0ebf8283 2019-07-24 stsp goto done;
6930 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6932 0ebf8283 2019-07-24 stsp goto done;
6934 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6936 0ebf8283 2019-07-24 stsp goto done;
6937 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6939 0ebf8283 2019-07-24 stsp goto done;
6941 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6943 0ebf8283 2019-07-24 stsp goto done;
6944 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6946 0ebf8283 2019-07-24 stsp goto done;
6948 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6950 0ebf8283 2019-07-24 stsp goto done;
6952 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6953 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6954 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6955 0ebf8283 2019-07-24 stsp if (commit_ref)
6956 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6957 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6958 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6959 0ebf8283 2019-07-24 stsp if (err) {
6960 0ebf8283 2019-07-24 stsp free(*commit_id);
6961 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6962 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6963 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6964 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6965 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6966 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6968 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6969 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6970 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6972 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6974 0ebf8283 2019-07-24 stsp return err;
6977 0ebf8283 2019-07-24 stsp static const struct got_error *
6978 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6980 0ebf8283 2019-07-24 stsp const struct got_error *err;
6981 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6982 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6984 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6986 0ebf8283 2019-07-24 stsp goto done;
6987 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6989 0ebf8283 2019-07-24 stsp goto done;
6991 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6992 0ebf8283 2019-07-24 stsp worktree);
6994 0ebf8283 2019-07-24 stsp goto done;
6995 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6997 0ebf8283 2019-07-24 stsp goto done;
6999 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7001 0ebf8283 2019-07-24 stsp goto done;
7002 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7004 0ebf8283 2019-07-24 stsp goto done;
7006 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7008 0ebf8283 2019-07-24 stsp goto done;
7009 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7011 0ebf8283 2019-07-24 stsp goto done;
7013 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7014 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7015 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7016 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7017 0ebf8283 2019-07-24 stsp return err;
7020 0ebf8283 2019-07-24 stsp const struct got_error *
7021 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7022 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7023 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7024 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7026 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7027 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7028 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7029 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7030 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7032 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7034 0ebf8283 2019-07-24 stsp return err;
7036 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7037 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7039 0ebf8283 2019-07-24 stsp goto done;
7041 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7043 0ebf8283 2019-07-24 stsp goto done;
7045 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7047 0ebf8283 2019-07-24 stsp goto done;
7049 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7050 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7052 0ebf8283 2019-07-24 stsp goto done;
7054 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7056 0ebf8283 2019-07-24 stsp goto done;
7058 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7060 0ebf8283 2019-07-24 stsp goto done;
7062 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7063 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7064 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7065 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7066 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7067 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7068 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7069 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7070 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7071 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7073 1f1abb7e 2019-08-08 stsp goto sync;
7075 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7076 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7078 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7079 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7080 0ebf8283 2019-07-24 stsp err = sync_err;
7082 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7083 0ebf8283 2019-07-24 stsp free(tree_id);
7084 818c7501 2019-07-11 stsp free(fileindex_path);
7086 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7087 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7088 818c7501 2019-07-11 stsp err = unlockerr;
7089 818c7501 2019-07-11 stsp return err;
7092 0ebf8283 2019-07-24 stsp const struct got_error *
7093 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7094 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7095 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7097 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7098 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7099 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7100 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7102 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7104 0ebf8283 2019-07-24 stsp return err;
7106 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7107 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7109 e600f124 2021-03-21 stsp goto done;
7111 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7112 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7114 0ebf8283 2019-07-24 stsp goto done;
7116 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7118 0ebf8283 2019-07-24 stsp goto done;
7120 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7122 0ebf8283 2019-07-24 stsp goto done;
7124 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7126 0ebf8283 2019-07-24 stsp goto done;
7128 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7130 a615e0e7 2020-12-16 stsp goto done;
7132 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7134 a615e0e7 2020-12-16 stsp goto done;
7135 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7136 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7137 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7138 a615e0e7 2020-12-16 stsp err = sync_err;
7140 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7141 a615e0e7 2020-12-16 stsp free(fileindex_path);
7142 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7143 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7144 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7145 0ebf8283 2019-07-24 stsp err = unlockerr;
7146 0ebf8283 2019-07-24 stsp return err;
7149 0ebf8283 2019-07-24 stsp const struct got_error *
7150 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7151 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7153 0ebf8283 2019-07-24 stsp const struct got_error *err;
7154 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7156 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7158 0ebf8283 2019-07-24 stsp return err;
7160 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7162 0ebf8283 2019-07-24 stsp goto done;
7164 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7166 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7167 2822a352 2019-10-15 stsp return err;
7170 2822a352 2019-10-15 stsp const struct got_error *
7171 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7172 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7173 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7174 2822a352 2019-10-15 stsp struct got_repository *repo)
7176 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7177 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7178 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7180 2822a352 2019-10-15 stsp *fileindex = NULL;
7181 2822a352 2019-10-15 stsp *branch_ref = NULL;
7182 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7184 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7186 2822a352 2019-10-15 stsp return err;
7188 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7189 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7190 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7191 2822a352 2019-10-15 stsp "update -b or different branch name required");
7192 2822a352 2019-10-15 stsp goto done;
7195 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7197 2822a352 2019-10-15 stsp goto done;
7199 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7200 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7201 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7202 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7205 2822a352 2019-10-15 stsp goto done;
7207 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7209 2822a352 2019-10-15 stsp goto done;
7211 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7212 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7214 2822a352 2019-10-15 stsp if (err) {
7215 2822a352 2019-10-15 stsp if (*branch_ref) {
7216 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7217 2822a352 2019-10-15 stsp *branch_ref = NULL;
7219 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7220 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7221 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7223 2822a352 2019-10-15 stsp if (*fileindex) {
7224 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7225 2822a352 2019-10-15 stsp *fileindex = NULL;
7227 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7229 0cb83759 2019-08-03 stsp return err;
7232 2822a352 2019-10-15 stsp const struct got_error *
7233 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7234 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7235 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7236 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7237 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7239 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7240 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7241 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7243 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7245 2822a352 2019-10-15 stsp goto done;
7247 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7249 2822a352 2019-10-15 stsp goto done;
7251 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7252 2822a352 2019-10-15 stsp worktree->path_prefix);
7254 2822a352 2019-10-15 stsp goto done;
7256 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7258 2822a352 2019-10-15 stsp goto done;
7260 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7261 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7263 2822a352 2019-10-15 stsp goto sync;
7265 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7267 2822a352 2019-10-15 stsp goto sync;
7269 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7271 6e210706 2021-01-22 stsp goto sync;
7273 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7275 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7276 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7277 2822a352 2019-10-15 stsp err = sync_err;
7280 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7281 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7282 2822a352 2019-10-15 stsp err = unlockerr;
7283 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7285 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7286 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7287 2822a352 2019-10-15 stsp err = unlockerr;
7288 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7290 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7291 2822a352 2019-10-15 stsp free(fileindex_path);
7292 2822a352 2019-10-15 stsp free(tree_id);
7294 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7295 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7296 2822a352 2019-10-15 stsp err = unlockerr;
7297 2822a352 2019-10-15 stsp return err;
7300 2822a352 2019-10-15 stsp const struct got_error *
7301 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7302 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7303 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7305 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7307 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7309 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7311 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7312 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7313 8b692cd0 2019-10-21 stsp err = unlockerr;
7314 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7316 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7317 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7318 8b692cd0 2019-10-21 stsp err = unlockerr;
7319 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7321 f259c4c1 2021-09-24 stsp return err;
7324 f259c4c1 2021-09-24 stsp const struct got_error *
7325 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7326 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7328 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7329 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7331 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7333 f259c4c1 2021-09-24 stsp goto done;
7335 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7337 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7338 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7339 f259c4c1 2021-09-24 stsp err = sync_err;
7341 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7342 f259c4c1 2021-09-24 stsp free(fileindex_path);
7343 8b692cd0 2019-10-21 stsp return err;
7346 f259c4c1 2021-09-24 stsp static const struct got_error *
7347 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7349 f259c4c1 2021-09-24 stsp const struct got_error *err;
7350 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7352 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7354 f259c4c1 2021-09-24 stsp goto done;
7355 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7357 f259c4c1 2021-09-24 stsp goto done;
7359 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7361 f259c4c1 2021-09-24 stsp goto done;
7362 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7364 f259c4c1 2021-09-24 stsp goto done;
7367 f259c4c1 2021-09-24 stsp free(branch_refname);
7368 f259c4c1 2021-09-24 stsp free(commit_refname);
7369 f259c4c1 2021-09-24 stsp return err;
7372 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7373 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7374 f259c4c1 2021-09-24 stsp const char *branch_name;
7377 f259c4c1 2021-09-24 stsp static const struct got_error *
7378 f259c4c1 2021-09-24 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7379 f259c4c1 2021-09-24 stsp void *arg)
7381 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7383 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7384 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7385 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7387 f259c4c1 2021-09-24 stsp return NULL;
7391 f259c4c1 2021-09-24 stsp const struct got_error *
7392 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7393 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7394 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7395 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7396 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7397 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7399 f259c4c1 2021-09-24 stsp const struct got_error *err;
7400 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7402 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7404 f259c4c1 2021-09-24 stsp goto done;
7406 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7407 f259c4c1 2021-09-24 stsp worktree);
7409 f259c4c1 2021-09-24 stsp goto done;
7411 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7412 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7413 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7415 f259c4c1 2021-09-24 stsp free(fileindex_path);
7416 f259c4c1 2021-09-24 stsp return err;
7419 f259c4c1 2021-09-24 stsp const struct got_error *
7420 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7421 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7422 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7423 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7424 0ff8d236 2021-09-28 stsp struct got_repository *repo,
7425 0ff8d236 2021-09-28 stsp got_worktree_status_cb status_cb, void *status_arg)
7428 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7429 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7430 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7431 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7432 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7433 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7434 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7435 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7436 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7438 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7440 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7442 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7444 f259c4c1 2021-09-24 stsp goto done;
7446 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7448 f259c4c1 2021-09-24 stsp goto done;
7450 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7452 f259c4c1 2021-09-24 stsp goto done;
7454 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7455 f259c4c1 2021-09-24 stsp &have_staged_files);
7456 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7457 f259c4c1 2021-09-24 stsp goto done;
7458 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7459 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7460 f259c4c1 2021-09-24 stsp goto done;
7463 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7464 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7465 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7466 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7467 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7468 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7469 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7470 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7472 f259c4c1 2021-09-24 stsp goto done;
7474 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7475 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7476 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7477 f259c4c1 2021-09-24 stsp goto done;
7480 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7481 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7482 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
7484 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
7485 f259c4c1 2021-09-24 stsp ct_path++;
7486 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
7487 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7488 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7490 f259c4c1 2021-09-24 stsp goto done;
7494 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
7495 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
7496 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
7497 f259c4c1 2021-09-24 stsp head_commit_id, branch_tip, worktree, author, committer,
7498 0ff8d236 2021-09-28 stsp merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7500 f259c4c1 2021-09-24 stsp goto done;
7502 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
7503 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
7504 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7505 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7506 f259c4c1 2021-09-24 stsp err = sync_err;
7508 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7509 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7510 f259c4c1 2021-09-24 stsp free_commitable(ct);
7512 f259c4c1 2021-09-24 stsp got_pathlist_free(&commitable_paths);
7513 f259c4c1 2021-09-24 stsp free(fileindex_path);
7514 f259c4c1 2021-09-24 stsp return err;
7517 f259c4c1 2021-09-24 stsp const struct got_error *
7518 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
7519 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
7521 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7522 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7524 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7526 f259c4c1 2021-09-24 stsp goto done;
7528 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7530 f259c4c1 2021-09-24 stsp goto done;
7531 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7532 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7533 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7534 f259c4c1 2021-09-24 stsp err = sync_err;
7536 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7537 f259c4c1 2021-09-24 stsp free(fileindex_path);
7538 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7539 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7540 f259c4c1 2021-09-24 stsp err = unlockerr;
7541 f259c4c1 2021-09-24 stsp return err;
7544 f259c4c1 2021-09-24 stsp const struct got_error *
7545 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7546 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7548 f259c4c1 2021-09-24 stsp const struct got_error *err;
7549 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
7550 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
7552 f259c4c1 2021-09-24 stsp *in_progress = 0;
7554 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7556 f259c4c1 2021-09-24 stsp return err;
7557 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7558 793fcac3 2021-09-24 stsp free(branch_refname);
7559 f259c4c1 2021-09-24 stsp if (err) {
7560 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
7561 f259c4c1 2021-09-24 stsp return err;
7563 f259c4c1 2021-09-24 stsp *in_progress = 1;
7565 f259c4c1 2021-09-24 stsp return NULL;
7568 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
7569 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7570 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
7572 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
7573 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7574 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7575 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7576 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
7577 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7578 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
7580 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7582 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7584 f259c4c1 2021-09-24 stsp return err;
7586 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7588 f259c4c1 2021-09-24 stsp goto done;
7590 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
7591 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
7592 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
7593 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7596 f259c4c1 2021-09-24 stsp goto done;
7598 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7600 f259c4c1 2021-09-24 stsp return err;
7602 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7604 f259c4c1 2021-09-24 stsp return err;
7606 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7609 f259c4c1 2021-09-24 stsp goto done;
7611 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7613 f259c4c1 2021-09-24 stsp goto done;
7615 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7616 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7617 f259c4c1 2021-09-24 stsp goto done;
7620 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
7622 f259c4c1 2021-09-24 stsp goto done;
7624 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7626 f259c4c1 2021-09-24 stsp goto done;
7627 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
7629 f259c4c1 2021-09-24 stsp goto done;
7631 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7633 f259c4c1 2021-09-24 stsp goto done;
7634 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
7636 f259c4c1 2021-09-24 stsp goto done;
7639 f259c4c1 2021-09-24 stsp free(branch_refname);
7640 f259c4c1 2021-09-24 stsp free(commit_refname);
7641 f259c4c1 2021-09-24 stsp free(fileindex_path);
7642 f259c4c1 2021-09-24 stsp if (branch_ref)
7643 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7644 f259c4c1 2021-09-24 stsp if (commit_ref)
7645 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7646 f259c4c1 2021-09-24 stsp if (wt_branch)
7647 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
7648 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
7649 f259c4c1 2021-09-24 stsp if (err) {
7650 f259c4c1 2021-09-24 stsp if (*fileindex) {
7651 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7652 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7654 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7656 f259c4c1 2021-09-24 stsp return err;
7659 f259c4c1 2021-09-24 stsp const struct got_error *
7660 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
7661 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7662 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7664 f259c4c1 2021-09-24 stsp const struct got_error *err;
7665 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
7666 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7667 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7668 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7670 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7671 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7672 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7674 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7676 f259c4c1 2021-09-24 stsp return err;
7678 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7680 f259c4c1 2021-09-24 stsp goto done;
7682 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7683 f259c4c1 2021-09-24 stsp &have_staged_files);
7684 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7685 f259c4c1 2021-09-24 stsp goto done;
7686 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7687 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7688 f259c4c1 2021-09-24 stsp goto done;
7691 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7693 f259c4c1 2021-09-24 stsp goto done;
7695 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7697 f259c4c1 2021-09-24 stsp goto done;
7699 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7701 f259c4c1 2021-09-24 stsp goto done;
7703 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
7704 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7705 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
7706 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
7707 f259c4c1 2021-09-24 stsp goto done;
7709 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7710 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
7711 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
7712 f259c4c1 2021-09-24 stsp goto done;
7715 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7717 f259c4c1 2021-09-24 stsp goto done;
7719 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
7721 f259c4c1 2021-09-24 stsp goto done;
7723 f259c4c1 2021-09-24 stsp free(commit_refname);
7724 f259c4c1 2021-09-24 stsp free(branch_refname);
7725 f259c4c1 2021-09-24 stsp free(fileindex_path);
7726 f259c4c1 2021-09-24 stsp if (commit_ref)
7727 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7728 f259c4c1 2021-09-24 stsp if (branch_ref)
7729 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7730 f259c4c1 2021-09-24 stsp if (err) {
7731 f259c4c1 2021-09-24 stsp if (*branch_name) {
7732 f259c4c1 2021-09-24 stsp free(*branch_name);
7733 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7735 f259c4c1 2021-09-24 stsp free(*branch_tip);
7736 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7737 f259c4c1 2021-09-24 stsp if (*fileindex) {
7738 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7739 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7741 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7743 f259c4c1 2021-09-24 stsp return err;
7746 f259c4c1 2021-09-24 stsp const struct got_error *
7747 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
7748 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7749 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7751 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7752 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
7753 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7754 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
7755 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
7757 f259c4c1 2021-09-24 stsp err = got_object_id_by_path(&tree_id, repo,
7758 f259c4c1 2021-09-24 stsp worktree->base_commit_id, worktree->path_prefix);
7760 f259c4c1 2021-09-24 stsp goto done;
7762 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7764 f259c4c1 2021-09-24 stsp goto done;
7766 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7768 f259c4c1 2021-09-24 stsp goto done;
7770 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
7771 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
7772 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
7773 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
7774 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
7775 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
7776 f259c4c1 2021-09-24 stsp rfa.repo = repo;
7777 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
7778 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7779 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7781 f259c4c1 2021-09-24 stsp goto sync;
7783 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7784 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7786 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7787 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7788 f259c4c1 2021-09-24 stsp err = sync_err;
7790 f259c4c1 2021-09-24 stsp free(tree_id);
7791 f259c4c1 2021-09-24 stsp free(commit_id);
7792 f259c4c1 2021-09-24 stsp if (fileindex)
7793 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7794 f259c4c1 2021-09-24 stsp free(fileindex_path);
7796 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7797 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7798 f259c4c1 2021-09-24 stsp err = unlockerr;
7799 f259c4c1 2021-09-24 stsp return err;
7802 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7803 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7804 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7805 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7806 2db2652d 2019-08-07 stsp struct got_repository *repo;
7807 2db2652d 2019-08-07 stsp int have_changes;
7810 2db2652d 2019-08-07 stsp const struct got_error *
7811 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7812 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7813 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7814 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7816 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7817 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7818 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7819 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7820 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7821 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7823 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7824 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7825 8b13ce36 2019-08-08 stsp return NULL;
7826 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7827 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7829 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7830 735ef5ac 2019-08-03 stsp if (ie == NULL)
7831 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7833 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7834 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7835 735ef5ac 2019-08-03 stsp relpath) == -1)
7836 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7838 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7839 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7840 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7841 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7844 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7845 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7846 3aa5969e 2019-08-06 stsp goto done;
7847 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7848 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7849 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7850 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7851 735ef5ac 2019-08-03 stsp goto done;
7854 2db2652d 2019-08-07 stsp a->have_changes = 1;
7856 735ef5ac 2019-08-03 stsp p = in_repo_path;
7857 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7859 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7860 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7861 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7863 735ef5ac 2019-08-03 stsp free(in_repo_path);
7864 dc424a06 2019-08-07 stsp return err;
7867 2db2652d 2019-08-07 stsp struct stage_path_arg {
7868 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7869 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7870 2db2652d 2019-08-07 stsp struct got_repository *repo;
7871 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7872 2db2652d 2019-08-07 stsp void *status_arg;
7873 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7874 2db2652d 2019-08-07 stsp void *patch_arg;
7875 7b5dc508 2019-10-28 stsp int staged_something;
7876 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7879 2db2652d 2019-08-07 stsp static const struct got_error *
7880 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7881 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7882 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7883 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7885 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7886 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7887 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7888 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7889 0cb83759 2019-08-03 stsp uint32_t stage;
7890 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7891 0aeb8099 2020-07-23 stsp struct stat sb;
7893 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7894 8b13ce36 2019-08-08 stsp return NULL;
7896 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7897 d3e7c587 2019-08-03 stsp if (ie == NULL)
7898 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7900 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7901 2db2652d 2019-08-07 stsp relpath)== -1)
7902 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7904 0cb83759 2019-08-03 stsp switch (status) {
7905 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7906 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7907 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7908 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7909 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7912 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7913 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7914 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7915 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7916 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7919 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7922 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7923 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7924 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7925 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7926 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7930 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7931 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7934 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7935 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7936 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7937 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7939 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7940 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7941 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7942 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7943 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7944 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7945 35213c7c 2020-07-23 stsp ssize_t target_len;
7946 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7947 35213c7c 2020-07-23 stsp sizeof(target_path));
7948 35213c7c 2020-07-23 stsp if (target_len == -1) {
7949 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7950 35213c7c 2020-07-23 stsp ondisk_path);
7953 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7954 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7955 35213c7c 2020-07-23 stsp a->worktree->root_path);
7958 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7959 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7960 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7964 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7965 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7966 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7968 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7969 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7971 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7972 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7974 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7975 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7977 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7978 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7979 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7981 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7982 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7984 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7985 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7986 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7987 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7990 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7992 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7993 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7997 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7998 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7999 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8000 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8002 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8003 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8006 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8008 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8009 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8011 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8012 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8015 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8019 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8020 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8021 dc424a06 2019-08-07 stsp free(path_content);
8022 2db2652d 2019-08-07 stsp free(ondisk_path);
8023 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8024 0ebf8283 2019-07-24 stsp return err;
8027 0cb83759 2019-08-03 stsp const struct got_error *
8028 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8029 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8030 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8031 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8032 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8034 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8035 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8036 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8037 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8038 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8039 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8040 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8041 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8043 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8045 0cb83759 2019-08-03 stsp return err;
8047 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8048 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8050 735ef5ac 2019-08-03 stsp goto done;
8051 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8053 735ef5ac 2019-08-03 stsp goto done;
8054 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8056 0cb83759 2019-08-03 stsp goto done;
8058 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8059 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8060 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8061 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8062 2db2652d 2019-08-07 stsp oka.repo = repo;
8063 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8064 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8065 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8066 62da3196 2021-10-01 stsp check_stage_ok, &oka, NULL, NULL, 1, 0);
8068 735ef5ac 2019-08-03 stsp goto done;
8070 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8071 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8072 2db2652d 2019-08-07 stsp goto done;
8075 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8076 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8077 2db2652d 2019-08-07 stsp spa.repo = repo;
8078 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8079 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8080 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8081 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8082 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8083 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8084 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8085 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8086 62da3196 2021-10-01 stsp stage_path, &spa, NULL, NULL, 1, 0);
8088 2db2652d 2019-08-07 stsp goto done;
8090 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8091 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8092 7b5dc508 2019-10-28 stsp goto done;
8095 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8096 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8097 0cb83759 2019-08-03 stsp err = sync_err;
8099 735ef5ac 2019-08-03 stsp if (head_ref)
8100 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8101 735ef5ac 2019-08-03 stsp free(head_commit_id);
8102 0cb83759 2019-08-03 stsp free(fileindex_path);
8103 0cb83759 2019-08-03 stsp if (fileindex)
8104 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8105 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8106 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8107 0cb83759 2019-08-03 stsp err = unlockerr;
8108 0cb83759 2019-08-03 stsp return err;
8111 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8112 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8113 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8114 ad493afc 2019-08-03 stsp struct got_repository *repo;
8115 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8116 ad493afc 2019-08-03 stsp void *progress_arg;
8117 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8118 2e1f37b0 2019-08-08 stsp void *patch_arg;
8121 2e1f37b0 2019-08-08 stsp static const struct got_error *
8122 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8123 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8124 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8125 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8126 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8128 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8129 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8130 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8131 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8132 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8133 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8134 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8136 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8137 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8139 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8141 2e1f37b0 2019-08-08 stsp return err;
8142 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8144 2e1f37b0 2019-08-08 stsp goto done;
8146 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8148 2e1f37b0 2019-08-08 stsp goto done;
8150 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8152 2e1f37b0 2019-08-08 stsp goto done;
8154 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8156 2e1f37b0 2019-08-08 stsp goto done;
8158 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8160 2e1f37b0 2019-08-08 stsp goto done;
8162 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8164 2e1f37b0 2019-08-08 stsp goto done;
8166 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8167 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8169 2e1f37b0 2019-08-08 stsp goto done;
8171 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8172 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8174 2e1f37b0 2019-08-08 stsp goto done;
8175 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8176 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8178 2e1f37b0 2019-08-08 stsp goto done;
8180 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8181 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8182 2e1f37b0 2019-08-08 stsp goto done;
8184 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8185 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8186 2e1f37b0 2019-08-08 stsp goto done;
8188 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8189 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8190 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
8191 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8192 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8193 fe621944 2020-11-10 stsp nchanges++;
8195 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8196 2e1f37b0 2019-08-08 stsp int choice;
8197 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8198 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8199 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8200 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8202 2e1f37b0 2019-08-08 stsp goto done;
8203 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8204 2e1f37b0 2019-08-08 stsp have_content = 1;
8206 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8207 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8210 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8211 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8212 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8214 2e1f37b0 2019-08-08 stsp free(label1);
8216 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8217 2e1f37b0 2019-08-08 stsp if (staged_blob)
8218 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8219 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8220 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8221 fe621944 2020-11-10 stsp err = free_err;
8222 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8223 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8224 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8225 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8226 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8227 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8228 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8229 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8230 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8231 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8232 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8233 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8234 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8235 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8236 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8237 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8238 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8239 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8240 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8242 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8243 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8244 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8245 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8246 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8247 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8248 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8250 2e1f37b0 2019-08-08 stsp free(path1);
8251 2e1f37b0 2019-08-08 stsp free(path2);
8252 fda8017d 2020-07-23 stsp return err;
8255 fda8017d 2020-07-23 stsp static const struct got_error *
8256 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8257 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8258 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8259 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8260 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8261 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8262 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8264 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8265 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8266 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8267 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8268 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8269 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8270 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8271 fda8017d 2020-07-23 stsp struct stat sb;
8273 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8274 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8275 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8277 fda8017d 2020-07-23 stsp return err;
8279 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8280 fda8017d 2020-07-23 stsp return NULL;
8282 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8283 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8284 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8286 fda8017d 2020-07-23 stsp goto done;
8289 00fe21f2 2021-12-31 stsp f = fopen(path_unstaged_content, "re");
8290 fda8017d 2020-07-23 stsp if (f == NULL) {
8291 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8292 fda8017d 2020-07-23 stsp path_unstaged_content);
8293 fda8017d 2020-07-23 stsp goto done;
8295 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8296 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8297 fda8017d 2020-07-23 stsp goto done;
8299 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8300 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8301 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8303 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8304 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8305 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8306 fda8017d 2020-07-23 stsp goto done;
8308 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8309 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8310 fda8017d 2020-07-23 stsp goto done;
8312 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8313 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8314 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8315 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8316 fda8017d 2020-07-23 stsp progress_arg);
8318 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8320 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8322 67a66647 2021-05-31 stsp return err;
8324 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8325 67a66647 2021-05-31 stsp parent) == -1) {
8326 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8327 67a66647 2021-05-31 stsp base_path = NULL;
8328 67a66647 2021-05-31 stsp goto done;
8331 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8333 67a66647 2021-05-31 stsp goto done;
8334 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8335 67a66647 2021-05-31 stsp blob_base);
8337 67a66647 2021-05-31 stsp goto done;
8340 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8341 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8343 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8344 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8345 eec2f5a9 2021-06-03 stsp ondisk_path);
8347 eec2f5a9 2021-06-03 stsp goto done;
8350 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path,
8351 8bd0cdad 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8352 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8353 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8354 eec2f5a9 2021-06-03 stsp goto done;
8356 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8357 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8358 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8359 eec2f5a9 2021-06-03 stsp close(fd);
8360 eec2f5a9 2021-06-03 stsp goto done;
8364 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8365 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8366 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8367 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8368 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8371 fda8017d 2020-07-23 stsp goto done;
8373 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8374 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8375 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8377 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8378 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8381 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8382 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8383 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8384 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8385 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8386 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8387 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8388 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8389 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8390 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8391 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8392 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8393 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8394 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8395 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8396 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8397 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8398 67a66647 2021-05-31 stsp free(blob_base_path);
8399 67a66647 2021-05-31 stsp free(parent);
8400 67a66647 2021-05-31 stsp free(base_path);
8401 2e1f37b0 2019-08-08 stsp return err;
8404 ad493afc 2019-08-03 stsp static const struct got_error *
8405 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8406 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8407 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8408 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8410 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8411 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8412 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8413 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8414 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8415 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8416 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8417 9bc94a15 2019-08-03 stsp struct stat sb;
8419 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8420 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8421 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8422 2e1f37b0 2019-08-08 stsp return NULL;
8424 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8425 ad493afc 2019-08-03 stsp if (ie == NULL)
8426 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8428 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8430 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8432 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8433 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8435 f69721c3 2019-10-21 stsp goto done;
8436 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8437 f69721c3 2019-10-21 stsp id_str) == -1) {
8438 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8439 f69721c3 2019-10-21 stsp goto done;
8442 ad493afc 2019-08-03 stsp switch (staged_status) {
8443 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8444 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8445 ad493afc 2019-08-03 stsp blob_id, 8192);
8448 ad493afc 2019-08-03 stsp /* fall through */
8449 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8450 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8451 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8452 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8453 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8454 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8457 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8460 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8461 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8462 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8463 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8464 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8465 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8468 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8469 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8472 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8473 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8474 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8475 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8476 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8477 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8478 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8479 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8480 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8482 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8483 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8484 36bf999c 2020-07-23 stsp char *staged_target;
8485 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8486 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8488 36bf999c 2020-07-23 stsp goto done;
8489 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8490 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8491 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8492 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8493 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8494 36bf999c 2020-07-23 stsp free(staged_target);
8496 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8497 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8498 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8499 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8500 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8501 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8502 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8506 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8509 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8510 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8511 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8512 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8515 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8516 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8517 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8518 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8519 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8522 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8524 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8525 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8529 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8530 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8531 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8532 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8535 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8539 ad493afc 2019-08-03 stsp free(ondisk_path);
8540 ad493afc 2019-08-03 stsp if (blob_base)
8541 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8542 ad493afc 2019-08-03 stsp if (blob_staged)
8543 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8544 f69721c3 2019-10-21 stsp free(id_str);
8545 f69721c3 2019-10-21 stsp free(label_orig);
8546 ad493afc 2019-08-03 stsp return err;
8549 ad493afc 2019-08-03 stsp const struct got_error *
8550 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8551 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8552 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8553 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8554 ad493afc 2019-08-03 stsp struct got_repository *repo)
8556 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8557 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8558 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8559 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8560 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8562 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8564 ad493afc 2019-08-03 stsp return err;
8566 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8568 ad493afc 2019-08-03 stsp goto done;
8570 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8571 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8572 ad493afc 2019-08-03 stsp upa.repo = repo;
8573 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8574 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8575 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8576 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8577 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8578 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8579 62da3196 2021-10-01 stsp unstage_path, &upa, NULL, NULL, 1, 0);
8581 ad493afc 2019-08-03 stsp goto done;
8584 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8585 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8586 ad493afc 2019-08-03 stsp err = sync_err;
8588 ad493afc 2019-08-03 stsp free(fileindex_path);
8589 ad493afc 2019-08-03 stsp if (fileindex)
8590 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8591 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8592 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8593 ad493afc 2019-08-03 stsp err = unlockerr;
8594 ad493afc 2019-08-03 stsp return err;
8597 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8598 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8599 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8600 b2118c49 2020-07-28 stsp void *info_arg;
8601 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8602 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8603 b2118c49 2020-07-28 stsp void *cancel_arg;
8606 b2118c49 2020-07-28 stsp static const struct got_error *
8607 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8609 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8610 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8611 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8612 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8613 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8614 b2118c49 2020-07-28 stsp int stage;
8616 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8617 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8619 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8620 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8621 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8624 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8625 b2118c49 2020-07-28 stsp return NULL;
8627 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8628 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8629 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8631 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8632 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8633 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8634 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8635 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8636 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8639 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8640 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8641 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8644 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8645 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8648 b2118c49 2020-07-28 stsp const struct got_error *
8649 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8650 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8651 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8652 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8655 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8656 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8657 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8658 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8660 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8662 b2118c49 2020-07-28 stsp return err;
8664 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8666 b2118c49 2020-07-28 stsp goto done;
8668 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8669 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8670 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8671 b2118c49 2020-07-28 stsp arg.paths = paths;
8672 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8673 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8674 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8677 b2118c49 2020-07-28 stsp free(fileindex_path);
8678 b2118c49 2020-07-28 stsp if (fileindex)
8679 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8680 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8681 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8682 b2118c49 2020-07-28 stsp err = unlockerr;
8683 b2118c49 2020-07-28 stsp return err;
