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 2020-01-02 naddy char *line = NULL;
1513 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1514 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1516 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1517 9bdd68dd 2020-01-02 naddy linelen = getline(&line, &linesize, f);
1518 9bdd68dd 2020-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 2020-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 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
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 c0df5966 2021-12-31 stsp fd = open(ondisk_path,
2820 c0df5966 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2821 1af628f4 2021-06-03 stsp if (fd == -1) {
2822 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2823 1af628f4 2021-06-03 stsp ondisk_path);
2824 1af628f4 2021-06-03 stsp goto done;
2826 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2827 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2828 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2829 1af628f4 2021-06-03 stsp ondisk_path);
2830 1af628f4 2021-06-03 stsp close(fd);
2831 1af628f4 2021-06-03 stsp goto done;
2833 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2835 1af628f4 2021-06-03 stsp goto done;
2836 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2837 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2838 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2839 1af628f4 2021-06-03 stsp goto done;
2841 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2842 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2843 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2844 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2845 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2847 234035bc 2019-06-01 stsp } else if (blob1) {
2848 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2849 d6c87207 2019-08-02 stsp strlen(path1));
2850 1ee397ad 2019-07-12 stsp if (ie == NULL)
2851 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2852 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2854 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2855 2b92fad7 2019-06-02 stsp path1) == -1)
2856 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2858 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2861 2b92fad7 2019-06-02 stsp goto done;
2863 2b92fad7 2019-06-02 stsp switch (status) {
2864 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2865 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2866 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2868 1ee397ad 2019-07-12 stsp goto done;
2869 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2871 2b92fad7 2019-06-02 stsp goto done;
2873 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2875 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2876 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2877 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2878 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2880 1ee397ad 2019-07-12 stsp goto done;
2882 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2884 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2885 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2886 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2888 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2889 0a22ca1a 2020-09-23 stsp * exists in the repository.
2891 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2893 0a22ca1a 2020-09-23 stsp goto done;
2894 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2895 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2896 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2898 0a22ca1a 2020-09-23 stsp goto done;
2899 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2902 0a22ca1a 2020-09-23 stsp goto done;
2904 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2907 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2908 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2910 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2911 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2914 0a22ca1a 2020-09-23 stsp goto done;
2917 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2918 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2919 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2920 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2922 1ee397ad 2019-07-12 stsp goto done;
2924 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2925 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2927 1ee397ad 2019-07-12 stsp goto done;
2932 234035bc 2019-06-01 stsp } else if (blob2) {
2933 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2934 234035bc 2019-06-01 stsp path2) == -1)
2935 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2936 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2937 d6c87207 2019-08-02 stsp strlen(path2));
2939 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2940 7f91a133 2019-12-13 stsp -1, NULL, repo);
2942 234035bc 2019-06-01 stsp goto done;
2943 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2944 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2945 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2946 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2947 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2948 1ee397ad 2019-07-12 stsp status, path2);
2949 234035bc 2019-06-01 stsp goto done;
2951 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2952 36bf999c 2020-07-23 stsp char *link_target2;
2953 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2956 36bf999c 2020-07-23 stsp goto done;
2957 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2958 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2959 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2960 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2961 36bf999c 2020-07-23 stsp free(link_target2);
2962 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2963 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2964 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2965 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2966 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2967 526a746f 2020-07-23 stsp a->progress_arg);
2969 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2970 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2973 dfe9fba0 2020-07-23 stsp goto done;
2974 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2975 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2976 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
2977 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2979 234035bc 2019-06-01 stsp goto done;
2982 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2983 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2984 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2985 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2986 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2987 5267b9e4 2021-09-26 stsp 0, 1, a->allow_bad_symlinks, repo,
2988 5267b9e4 2021-09-26 stsp a->progress_cb, a->progress_arg);
2990 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2991 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2992 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2995 234035bc 2019-06-01 stsp goto done;
2996 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2998 234035bc 2019-06-01 stsp goto done;
2999 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3000 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3001 3969253a 2020-03-07 stsp if (err) {
3002 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3003 3969253a 2020-03-07 stsp goto done;
3005 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3006 2b92fad7 2019-06-02 stsp if (err) {
3007 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3008 2b92fad7 2019-06-02 stsp goto done;
3010 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3011 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3012 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3017 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3018 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3019 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3020 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3021 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3022 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3023 1af628f4 2021-06-03 stsp free(id_str);
3024 54d5be07 2021-06-03 stsp free(label_deriv2);
3025 234035bc 2019-06-01 stsp free(ondisk_path);
3026 234035bc 2019-06-01 stsp return err;
3029 69de9dd4 2021-09-03 stsp static const struct got_error *
3030 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3032 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3034 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3035 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3036 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3037 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3038 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3040 69de9dd4 2021-09-03 stsp return NULL;
3043 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3044 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3045 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3046 234035bc 2019-06-01 stsp struct got_repository *repo;
3049 234035bc 2019-06-01 stsp static const struct got_error *
3050 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3051 69de9dd4 2021-09-03 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3052 69de9dd4 2021-09-03 stsp struct got_object_id *id2, const char *path1, const char *path2,
3053 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3055 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3056 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3057 234035bc 2019-06-01 stsp unsigned char status;
3058 234035bc 2019-06-01 stsp struct stat sb;
3059 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3060 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3061 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3062 234035bc 2019-06-01 stsp char *ondisk_path;
3064 69de9dd4 2021-09-03 stsp if (id == NULL)
3065 69de9dd4 2021-09-03 stsp return NULL;
3067 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3068 69de9dd4 2021-09-03 stsp if (ie == NULL)
3069 69de9dd4 2021-09-03 stsp return NULL;
3071 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3073 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3075 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3076 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3077 5546d466 2021-09-02 stsp free(ondisk_path);
3079 234035bc 2019-06-01 stsp return err;
3080 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3081 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3083 234035bc 2019-06-01 stsp return NULL;
3086 818c7501 2019-07-11 stsp static const struct got_error *
3087 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3088 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3089 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3090 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3091 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3093 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3094 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3095 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3096 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3097 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3098 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3100 03415a1a 2019-06-02 stsp if (commit_id1) {
3101 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3102 03415a1a 2019-06-02 stsp worktree->path_prefix);
3103 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3104 03415a1a 2019-06-02 stsp goto done;
3106 69d57f3d 2020-07-31 stsp if (tree_id1) {
3107 69d57f3d 2020-07-31 stsp char *id_str;
3109 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3111 03415a1a 2019-06-02 stsp goto done;
3113 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3115 f69721c3 2019-10-21 stsp goto done;
3117 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3118 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3119 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3120 f69721c3 2019-10-21 stsp free(id_str);
3121 f69721c3 2019-10-21 stsp goto done;
3123 f69721c3 2019-10-21 stsp free(id_str);
3126 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3127 234035bc 2019-06-01 stsp worktree->path_prefix);
3129 234035bc 2019-06-01 stsp goto done;
3131 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3133 234035bc 2019-06-01 stsp goto done;
3135 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3136 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3137 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3138 69de9dd4 2021-09-03 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3139 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3141 69de9dd4 2021-09-03 stsp goto done;
3143 234035bc 2019-06-01 stsp arg.worktree = worktree;
3144 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3145 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3146 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3147 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3148 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3149 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3150 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3151 5267b9e4 2021-09-26 stsp arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3152 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3153 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3154 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3155 af12c6b9 2019-06-04 stsp err = sync_err;
3157 234035bc 2019-06-01 stsp if (tree1)
3158 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3159 234035bc 2019-06-01 stsp if (tree2)
3160 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3161 f69721c3 2019-10-21 stsp free(label_orig);
3162 818c7501 2019-07-11 stsp return err;
3165 818c7501 2019-07-11 stsp const struct got_error *
3166 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3167 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3168 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3169 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3171 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3172 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3173 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3175 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3177 818c7501 2019-07-11 stsp return err;
3179 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3181 818c7501 2019-07-11 stsp goto done;
3183 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3184 69de9dd4 2021-09-03 stsp worktree);
3186 818c7501 2019-07-11 stsp goto done;
3188 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3189 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3190 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3192 818c7501 2019-07-11 stsp if (fileindex)
3193 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3194 818c7501 2019-07-11 stsp free(fileindex_path);
3195 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3196 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3197 234035bc 2019-06-01 stsp err = unlockerr;
3198 234035bc 2019-06-01 stsp return err;
3201 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3202 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3203 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3204 927df6b7 2019-02-10 stsp const char *status_path;
3205 927df6b7 2019-02-10 stsp size_t status_path_len;
3206 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3207 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3208 f8d1f275 2019-02-04 stsp void *status_arg;
3209 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3210 f8d1f275 2019-02-04 stsp void *cancel_arg;
3211 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3212 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3213 f2a9dc41 2019-12-13 tracey int report_unchanged;
3214 3143d852 2020-06-25 stsp int no_ignores;
3217 f8d1f275 2019-02-04 stsp static const struct got_error *
3218 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3219 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3220 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3221 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3223 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3224 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3225 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3226 927df6b7 2019-02-10 stsp struct stat sb;
3227 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3228 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3229 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3231 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3233 98eaaa12 2019-08-03 stsp return err;
3235 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3236 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3237 98eaaa12 2019-08-03 stsp return NULL;
3239 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3240 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3241 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3243 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3244 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3245 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3247 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3248 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3249 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3250 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3251 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3254 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3255 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3258 927df6b7 2019-02-10 stsp static const struct got_error *
3259 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3260 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3262 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3263 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3264 f8d1f275 2019-02-04 stsp char *abspath;
3266 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3267 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3269 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3270 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3271 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3272 927df6b7 2019-02-10 stsp return NULL;
3274 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3275 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3276 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3277 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3279 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3280 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3281 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3284 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3285 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3286 f8d1f275 2019-02-04 stsp free(abspath);
3287 9d31a1d8 2018-03-11 stsp return err;
3290 f8d1f275 2019-02-04 stsp static const struct got_error *
3291 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3293 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3294 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3295 2ec1f75b 2019-03-26 stsp unsigned char status;
3297 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3298 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3300 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3301 927df6b7 2019-02-10 stsp return NULL;
3303 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3304 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3305 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3306 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3308 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3309 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3310 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3314 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3316 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3318 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3319 6841da00 2019-08-08 stsp free((char *)pe->path);
3320 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3324 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3326 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3328 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3329 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3330 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3331 6841da00 2019-08-08 stsp free((char *)pe->path);
3333 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3336 6841da00 2019-08-08 stsp static const struct got_error *
3337 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3339 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3340 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3341 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3342 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3343 6841da00 2019-08-08 stsp size_t linesize = 0;
3344 6841da00 2019-08-08 stsp ssize_t linelen;
3346 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3347 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3348 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3349 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3351 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3352 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3353 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3355 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3356 bd8de430 2019-10-04 stsp if (line[0] == '#')
3359 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3360 bd8de430 2019-10-04 stsp if (line[0] == '!')
3363 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3364 6841da00 2019-08-08 stsp line) == -1) {
3365 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3366 6841da00 2019-08-08 stsp goto done;
3368 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3370 6841da00 2019-08-08 stsp goto done;
3372 6841da00 2019-08-08 stsp if (ferror(f)) {
3373 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3374 6841da00 2019-08-08 stsp goto done;
3377 6841da00 2019-08-08 stsp dirpath = strdup(path);
3378 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3379 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3380 6841da00 2019-08-08 stsp goto done;
3382 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3384 6841da00 2019-08-08 stsp free(line);
3385 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3386 6841da00 2019-08-08 stsp free(dirpath);
3387 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3389 6841da00 2019-08-08 stsp return err;
3393 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3395 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3397 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3398 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3399 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3400 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3402 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3403 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3405 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3407 bd8de430 2019-10-04 stsp pattern += 3;
3409 bd8de430 2019-10-04 stsp while (*p) {
3410 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3411 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3412 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3413 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3415 bd8de430 2019-10-04 stsp while (*p == '/')
3425 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3426 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3427 6841da00 2019-08-08 stsp * ignores backwards.
3429 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3430 6841da00 2019-08-08 stsp while (pe) {
3431 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3432 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3433 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3434 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3435 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3436 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3437 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3438 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3439 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3444 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3450 6841da00 2019-08-08 stsp static const struct got_error *
3451 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3452 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3454 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3455 6841da00 2019-08-08 stsp char *ignorespath;
3456 886cec17 2019-12-15 stsp int fd = -1;
3457 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3459 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3460 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3461 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3463 886cec17 2019-12-15 stsp if (dirfd != -1) {
3464 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, ignores_filename,
3465 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3466 886cec17 2019-12-15 stsp if (fd == -1) {
3467 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3468 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3469 886cec17 2019-12-15 stsp ignorespath);
3471 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3472 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3473 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3474 886cec17 2019-12-15 stsp ignorespath);
3477 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3481 00fe21f2 2021-12-31 stsp ignoresfile = fopen(ignorespath, "re");
3482 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3483 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3484 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3485 886cec17 2019-12-15 stsp ignorespath);
3487 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3490 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3491 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3492 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3493 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3494 6841da00 2019-08-08 stsp free(ignorespath);
3495 6841da00 2019-08-08 stsp return err;
3498 f8d1f275 2019-02-04 stsp static const struct got_error *
3499 62da3196 2021-10-01 stsp status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3500 62da3196 2021-10-01 stsp int dirfd)
3502 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3503 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3504 f8d1f275 2019-02-04 stsp char *path = NULL;
3506 62da3196 2021-10-01 stsp if (ignore != NULL)
3507 62da3196 2021-10-01 stsp *ignore = 0;
3509 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3510 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3512 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3513 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3514 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3516 f8d1f275 2019-02-04 stsp path = de->d_name;
3519 62da3196 2021-10-01 stsp if (de->d_type == DT_DIR) {
3520 62da3196 2021-10-01 stsp if (!a->no_ignores && ignore != NULL &&
3521 62da3196 2021-10-01 stsp match_ignores(a->ignores, path))
3522 62da3196 2021-10-01 stsp *ignore = 1;
3523 62da3196 2021-10-01 stsp } else if (!match_ignores(a->ignores, path) &&
3524 62da3196 2021-10-01 stsp got_path_is_child(path, a->status_path, a->status_path_len))
3525 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3526 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3527 f8d1f275 2019-02-04 stsp if (parent_path[0])
3528 f8d1f275 2019-02-04 stsp free(path);
3529 b72f483a 2019-02-05 stsp return err;
3532 347d1d3e 2019-07-12 stsp static const struct got_error *
3533 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3535 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3536 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3538 3143d852 2020-06-25 stsp if (a->no_ignores)
3539 3143d852 2020-06-25 stsp return NULL;
3541 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3542 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3544 3143d852 2020-06-25 stsp return err;
3546 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3547 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3549 3143d852 2020-06-25 stsp return err;
3552 3143d852 2020-06-25 stsp static const struct got_error *
3553 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3554 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3555 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3556 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3558 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3559 abb4604f 2019-07-27 stsp struct stat sb;
3561 0e33f8e0 2021-09-01 stsp if (!no_ignores && match_ignores(ignores, path))
3562 ff56836b 2021-07-08 stsp return NULL;
3564 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3566 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3567 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3569 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3570 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3571 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3572 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3573 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3574 abb4604f 2019-07-27 stsp return NULL;
3577 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3578 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3579 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3581 abb4604f 2019-07-27 stsp return NULL;
3584 3143d852 2020-06-25 stsp static const struct got_error *
3585 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3586 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3588 3143d852 2020-06-25 stsp const struct got_error *err;
3589 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3591 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3592 3143d852 2020-06-25 stsp ".cvsignore");
3594 3143d852 2020-06-25 stsp return err;
3596 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3597 3143d852 2020-06-25 stsp ".gitignore");
3599 3143d852 2020-06-25 stsp return err;
3601 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3602 3143d852 2020-06-25 stsp if (err) {
3603 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3604 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3605 3143d852 2020-06-25 stsp return err;
3607 3143d852 2020-06-25 stsp for (;;) {
3608 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3609 3143d852 2020-06-25 stsp ".cvsignore");
3612 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3613 3143d852 2020-06-25 stsp ".gitignore");
3616 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3617 3143d852 2020-06-25 stsp if (err) {
3618 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3619 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3622 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3624 b737c85a 2020-06-26 stsp free(parent_path);
3625 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3626 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3629 b737c85a 2020-06-26 stsp free(parent_path);
3630 b737c85a 2020-06-26 stsp free(next_parent_path);
3631 3143d852 2020-06-25 stsp return err;
3634 abb4604f 2019-07-27 stsp static const struct got_error *
3635 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3636 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3637 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3638 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3639 f2a9dc41 2019-12-13 tracey int report_unchanged)
3641 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3642 6fc93f37 2019-12-13 stsp int fd = -1;
3643 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3644 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3645 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3646 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3648 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3650 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3651 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3652 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3654 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3655 6fc93f37 2019-12-13 stsp if (fd == -1) {
3656 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3657 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
3658 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3660 ff56836b 2021-07-08 stsp if (!no_ignores) {
3661 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3662 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3664 ff56836b 2021-07-08 stsp goto done;
3666 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3667 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3668 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3671 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3672 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3673 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3674 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3675 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3676 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3677 abb4604f 2019-07-27 stsp arg.status_path = path;
3678 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3679 abb4604f 2019-07-27 stsp arg.repo = repo;
3680 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3681 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3682 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3683 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3684 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3685 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3686 022fae89 2019-12-06 tracey if (!no_ignores) {
3687 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3688 3143d852 2020-06-25 stsp worktree->root_path, path);
3690 3143d852 2020-06-25 stsp goto done;
3692 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3693 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3694 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3697 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3698 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3699 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3700 927df6b7 2019-02-10 stsp free(ondisk_path);
3701 347d1d3e 2019-07-12 stsp return err;
3704 347d1d3e 2019-07-12 stsp const struct got_error *
3705 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3706 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3707 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3708 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3710 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3711 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3712 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3713 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3715 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3717 347d1d3e 2019-07-12 stsp return err;
3719 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3720 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3721 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3722 f6343036 2021-06-22 stsp no_ignores, 0);
3726 f8d1f275 2019-02-04 stsp free(fileindex_path);
3727 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3728 f8d1f275 2019-02-04 stsp return err;
3731 6c7ab921 2019-03-18 stsp const struct got_error *
3732 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3733 6c7ab921 2019-03-18 stsp const char *arg)
3735 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3736 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3737 6c7ab921 2019-03-18 stsp size_t len;
3738 00bb5ea0 2020-07-23 stsp struct stat sb;
3739 01740607 2020-11-04 stsp char *abspath = NULL;
3740 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3742 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3744 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3745 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3746 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3748 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3749 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3750 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3751 00bb5ea0 2020-07-23 stsp goto done;
3753 727173c3 2020-11-06 stsp sb.st_mode = 0;
3755 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3757 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3758 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3759 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3760 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3762 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3763 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3764 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3765 00bb5ea0 2020-07-23 stsp goto done;
3769 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3770 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3772 d0710d08 2019-07-22 stsp goto done;
3773 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3774 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3775 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3776 00bb5ea0 2020-07-23 stsp goto done;
3779 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3780 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3781 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3782 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3783 00bb5ea0 2020-07-23 stsp goto done;
3785 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3786 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3787 01740607 2020-11-04 stsp goto done;
3789 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3790 01740607 2020-11-04 stsp sizeof(canonpath));
3792 00bb5ea0 2020-07-23 stsp goto done;
3793 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3794 01740607 2020-11-04 stsp if (resolved == NULL) {
3795 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3796 01740607 2020-11-04 stsp goto done;
3801 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3802 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3803 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3804 6c7ab921 2019-03-18 stsp goto done;
3807 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3808 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3809 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3811 f6d88e1a 2019-05-29 stsp goto done;
3813 f6d88e1a 2019-05-29 stsp path = strdup("");
3814 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3815 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3816 f6d88e1a 2019-05-29 stsp goto done;
3820 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3821 6c7ab921 2019-03-18 stsp len = strlen(path);
3822 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3823 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3827 01740607 2020-11-04 stsp free(abspath);
3828 6c7ab921 2019-03-18 stsp free(resolved);
3829 d0710d08 2019-07-22 stsp free(cwd);
3830 6c7ab921 2019-03-18 stsp if (err == NULL)
3831 6c7ab921 2019-03-18 stsp *wt_path = path;
3833 6c7ab921 2019-03-18 stsp free(path);
3834 d00136be 2019-03-26 stsp return err;
3837 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3838 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3839 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3840 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3841 4e68cba3 2019-11-23 stsp void *progress_arg;
3842 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3845 4e68cba3 2019-11-23 stsp static const struct got_error *
3846 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3847 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3848 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3849 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3851 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3852 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3853 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3854 6d022e97 2019-08-04 stsp struct stat sb;
3855 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3857 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3858 dbb83fbd 2019-12-12 stsp relpath) == -1)
3859 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3861 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3863 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3864 12463d8b 2019-12-13 stsp de_name, a->repo);
3866 dbb83fbd 2019-12-12 stsp goto done;
3867 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3868 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3869 dbb83fbd 2019-12-12 stsp goto done;
3870 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3872 dbb83fbd 2019-12-12 stsp goto done;
3875 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3876 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3877 dbb83fbd 2019-12-12 stsp goto done;
3880 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3882 4e68cba3 2019-11-23 stsp goto done;
3883 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3884 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3885 3969253a 2020-03-07 stsp if (err) {
3886 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3887 3969253a 2020-03-07 stsp goto done;
3889 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3890 07f5b47a 2019-06-02 stsp if (err) {
3891 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3892 4e68cba3 2019-11-23 stsp goto done;
3895 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3897 dbb83fbd 2019-12-12 stsp return err;
3898 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3899 dbb83fbd 2019-12-12 stsp return NULL;
3900 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3903 d00136be 2019-03-26 stsp const struct got_error *
3904 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3905 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3906 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3907 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3909 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3910 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3911 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3912 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3913 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3915 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3917 d00136be 2019-03-26 stsp return err;
3919 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3921 d00136be 2019-03-26 stsp goto done;
3923 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3924 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3925 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3926 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3927 4e68cba3 2019-11-23 stsp saa.repo = repo;
3929 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3930 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3931 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3935 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3936 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3937 af12c6b9 2019-06-04 stsp err = sync_err;
3939 fb399478 2019-07-12 stsp free(fileindex_path);
3940 d00136be 2019-03-26 stsp if (fileindex)
3941 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3942 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3943 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3944 d00136be 2019-03-26 stsp err = unlockerr;
3945 6c7ab921 2019-03-18 stsp return err;
3948 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3949 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3950 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3951 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3952 f2a9dc41 2019-12-13 tracey void *progress_arg;
3953 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3954 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3955 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3956 766841c2 2020-08-13 stsp const char *status_codes;
3959 f2a9dc41 2019-12-13 tracey static const struct got_error *
3960 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3961 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3962 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3963 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3965 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3966 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3967 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3968 17ed4618 2019-06-02 stsp struct stat sb;
3969 20a2ad1c 2020-10-20 stsp char *ondisk_path;
3971 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3972 17ed4618 2019-06-02 stsp if (ie == NULL)
3973 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3975 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3976 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3977 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3978 9acbc4fa 2019-08-03 stsp return NULL;
3979 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3982 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3983 f2a9dc41 2019-12-13 tracey relpath) == -1)
3984 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3986 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3989 f2a9dc41 2019-12-13 tracey goto done;
3991 766841c2 2020-08-13 stsp if (a->status_codes) {
3992 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
3994 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
3995 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
3998 766841c2 2020-08-13 stsp if (i == ncodes) {
3999 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4000 766841c2 2020-08-13 stsp free(ondisk_path);
4001 766841c2 2020-08-13 stsp return NULL;
4003 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4004 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4005 766841c2 2020-08-13 stsp static char msg[64];
4006 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4007 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4008 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4009 766841c2 2020-08-13 stsp goto done;
4013 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4014 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4015 f2a9dc41 2019-12-13 tracey goto done;
4016 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4017 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4018 f2a9dc41 2019-12-13 tracey goto done;
4020 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4021 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4022 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4023 f2a9dc41 2019-12-13 tracey goto done;
4027 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4028 20a2ad1c 2020-10-20 stsp size_t root_len;
4030 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4031 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4032 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4033 12463d8b 2019-12-13 stsp ondisk_path);
4034 12463d8b 2019-12-13 stsp goto done;
4036 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4037 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4038 12463d8b 2019-12-13 stsp goto done;
4041 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4043 20a2ad1c 2020-10-20 stsp char *parent;
4044 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4046 2513f20a 2020-10-20 stsp goto done;
4047 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4048 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4049 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4050 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4051 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4052 20a2ad1c 2020-10-20 stsp ondisk_path);
4055 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4056 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4059 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4061 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4062 f2a9dc41 2019-12-13 tracey if (err)
4063 f2a9dc41 2019-12-13 tracey return err;
4064 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4065 f2a9dc41 2019-12-13 tracey return NULL;
4066 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4067 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4070 2ec1f75b 2019-03-26 stsp const struct got_error *
4071 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4072 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4073 766841c2 2020-08-13 stsp const char *status_codes,
4074 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4075 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
4077 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4078 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4079 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4080 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4081 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4083 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4085 2ec1f75b 2019-03-26 stsp return err;
4087 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4089 2ec1f75b 2019-03-26 stsp goto done;
4091 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4092 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4093 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4094 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4095 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4096 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4097 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4098 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4100 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4101 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4102 62da3196 2021-10-01 stsp schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4106 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4107 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4108 af12c6b9 2019-06-04 stsp err = sync_err;
4110 fb399478 2019-07-12 stsp free(fileindex_path);
4111 2ec1f75b 2019-03-26 stsp if (fileindex)
4112 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4113 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4114 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4115 2ec1f75b 2019-03-26 stsp err = unlockerr;
4116 33aa809d 2019-08-08 stsp return err;
4119 33aa809d 2019-08-08 stsp static const struct got_error *
4120 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4122 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4123 33aa809d 2019-08-08 stsp char *line = NULL;
4124 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4125 33aa809d 2019-08-08 stsp ssize_t linelen;
4127 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4128 33aa809d 2019-08-08 stsp if (linelen == -1) {
4129 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4130 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4131 33aa809d 2019-08-08 stsp goto done;
4133 33aa809d 2019-08-08 stsp return NULL;
4135 33aa809d 2019-08-08 stsp if (outfile) {
4136 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4137 33aa809d 2019-08-08 stsp if (n != linelen) {
4138 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4139 33aa809d 2019-08-08 stsp goto done;
4142 33aa809d 2019-08-08 stsp if (rejectfile) {
4143 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4144 33aa809d 2019-08-08 stsp if (n != linelen)
4145 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4148 33aa809d 2019-08-08 stsp free(line);
4149 2ec1f75b 2019-03-26 stsp return err;
4152 33aa809d 2019-08-08 stsp static const struct got_error *
4153 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4155 33aa809d 2019-08-08 stsp char *line = NULL;
4156 33aa809d 2019-08-08 stsp size_t linesize = 0;
4157 33aa809d 2019-08-08 stsp ssize_t linelen;
4159 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4160 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4161 500467ff 2019-09-25 hiltjo if (ferror(f))
4162 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4163 500467ff 2019-09-25 hiltjo return NULL;
4165 33aa809d 2019-08-08 stsp free(line);
4166 33aa809d 2019-08-08 stsp return NULL;
4169 33aa809d 2019-08-08 stsp static const struct got_error *
4170 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4171 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4172 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4174 33aa809d 2019-08-08 stsp const struct got_error *err;
4176 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4177 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4178 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4180 33aa809d 2019-08-08 stsp return err;
4181 33aa809d 2019-08-08 stsp (*line_cur1)++;
4183 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4184 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4185 33aa809d 2019-08-08 stsp if (rejectfile)
4186 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4188 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4190 33aa809d 2019-08-08 stsp return err;
4191 33aa809d 2019-08-08 stsp (*line_cur2)++;
4193 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4194 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4195 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4197 33aa809d 2019-08-08 stsp return err;
4198 33aa809d 2019-08-08 stsp (*line_cur2)++;
4200 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4201 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4202 33aa809d 2019-08-08 stsp if (rejectfile)
4203 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4205 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4207 33aa809d 2019-08-08 stsp return err;
4208 33aa809d 2019-08-08 stsp (*line_cur1)++;
4211 f1e81a05 2019-08-10 stsp return NULL;
4214 f1e81a05 2019-08-10 stsp static const struct got_error *
4215 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4216 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4218 f1e81a05 2019-08-10 stsp const struct got_error *err;
4220 f1e81a05 2019-08-10 stsp if (outfile) {
4221 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4222 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4223 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4225 f1e81a05 2019-08-10 stsp return err;
4226 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4229 f1e81a05 2019-08-10 stsp if (rejectfile) {
4230 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4231 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4232 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4234 f1e81a05 2019-08-10 stsp return err;
4235 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4239 33aa809d 2019-08-08 stsp return NULL;
4242 33aa809d 2019-08-08 stsp static const struct got_error *
4243 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4244 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4245 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4246 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4247 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4249 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4250 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4251 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4252 33aa809d 2019-08-08 stsp FILE *hunkfile;
4253 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4254 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4257 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4259 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4260 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4261 fe621944 2020-11-10 stsp start_old = cc.left.start;
4262 fe621944 2020-11-10 stsp end_old = cc.left.end;
4263 fe621944 2020-11-10 stsp start_new = cc.right.start;
4264 fe621944 2020-11-10 stsp end_new = cc.right.end;
4266 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4267 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4268 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4270 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4271 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4272 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4274 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4275 fe621944 2020-11-10 stsp if (diff_state == NULL)
4276 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4277 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4279 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4280 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4281 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4282 33aa809d 2019-08-08 stsp goto done;
4285 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4286 fe621944 2020-11-10 stsp diff_result, &cc);
4287 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4288 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4289 33aa809d 2019-08-08 stsp goto done;
4292 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4293 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4294 33aa809d 2019-08-08 stsp goto done;
4297 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4298 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4300 33aa809d 2019-08-08 stsp goto done;
4302 33aa809d 2019-08-08 stsp switch (*choice) {
4303 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4304 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4305 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4307 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4308 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4309 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4311 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4314 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4318 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4319 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4320 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4321 33aa809d 2019-08-08 stsp return err;
4324 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4325 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4326 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4327 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4328 1f1abb7e 2019-08-08 stsp void *progress_arg;
4329 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4330 33aa809d 2019-08-08 stsp void *patch_arg;
4331 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4332 f259c4c1 2021-09-24 stsp int unlink_added_files;
4335 e20a8b6f 2019-06-04 stsp static const struct got_error *
4336 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4337 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4338 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4339 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4340 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4342 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4343 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4344 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4345 1ebedb77 2019-10-19 stsp int fd2 = -1;
4346 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4347 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4348 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4349 fe621944 2020-11-10 stsp struct stat sb2;
4350 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4351 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4352 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4354 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4356 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4358 33aa809d 2019-08-08 stsp return err;
4360 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4361 e7ae0baf 2021-12-31 stsp fd2 = openat(dirfd2, de_name2,
4362 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4363 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4364 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4365 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4366 fa3cef63 2020-07-23 stsp goto done;
4368 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4369 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4370 c0df5966 2021-12-31 stsp if (link_len == -1) {
4371 c0df5966 2021-12-31 stsp return got_error_from_errno2("readlinkat",
4374 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4375 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4378 8bd0cdad 2021-12-31 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4379 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4380 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4381 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4382 fa3cef63 2020-07-23 stsp goto done;
4384 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4385 fa3cef63 2020-07-23 stsp sizeof(link_target));
4386 fa3cef63 2020-07-23 stsp if (link_len == -1)
4387 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4388 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4389 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4392 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4393 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4394 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4395 fa3cef63 2020-07-23 stsp goto done;
4398 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4399 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4400 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4401 fa3cef63 2020-07-23 stsp goto done;
4406 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4407 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4408 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4409 fa3cef63 2020-07-23 stsp goto done;
4411 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4412 fa3cef63 2020-07-23 stsp if (n != link_len) {
4413 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4414 fa3cef63 2020-07-23 stsp goto done;
4416 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4417 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4418 fa3cef63 2020-07-23 stsp goto done;
4420 fa3cef63 2020-07-23 stsp rewind(f2);
4423 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4425 33aa809d 2019-08-08 stsp goto done;
4427 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4429 33aa809d 2019-08-08 stsp goto done;
4431 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4433 33aa809d 2019-08-08 stsp goto done;
4435 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4438 33aa809d 2019-08-08 stsp goto done;
4440 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4442 33aa809d 2019-08-08 stsp goto done;
4444 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4445 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4446 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4447 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4449 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4450 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4451 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4452 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4453 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4454 fe621944 2020-11-10 stsp nchanges++;
4456 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4457 33aa809d 2019-08-08 stsp int choice;
4458 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4459 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4460 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4461 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4462 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4463 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4465 33aa809d 2019-08-08 stsp goto done;
4466 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4467 33aa809d 2019-08-08 stsp have_content = 1;
4468 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4471 1ebedb77 2019-10-19 stsp if (have_content) {
4472 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4473 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4474 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4476 1ebedb77 2019-10-19 stsp goto done;
4478 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4479 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4480 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4481 fa3cef63 2020-07-23 stsp goto done;
4486 33aa809d 2019-08-08 stsp free(id_str);
4488 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4489 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4490 fe621944 2020-11-10 stsp if (err == NULL)
4491 fe621944 2020-11-10 stsp err = free_err;
4492 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4493 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4494 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4495 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4496 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4497 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4498 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4499 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4500 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4501 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4502 33aa809d 2019-08-08 stsp if (err || !have_content) {
4503 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4504 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4505 33aa809d 2019-08-08 stsp free(*path_outfile);
4506 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4508 33aa809d 2019-08-08 stsp free(path1);
4509 33aa809d 2019-08-08 stsp return err;
4512 33aa809d 2019-08-08 stsp static const struct got_error *
4513 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4514 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4515 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4516 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4518 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4519 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4520 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4521 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4522 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4523 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4524 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4525 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4526 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4527 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4529 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4530 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4531 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4532 d3bcc3d1 2019-08-08 stsp return NULL;
4534 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4535 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4536 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4538 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4539 65084dad 2019-08-08 stsp if (ie == NULL)
4540 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4542 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4543 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4544 a129376b 2019-03-28 stsp if (err) {
4545 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4546 a129376b 2019-03-28 stsp goto done;
4547 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4548 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4549 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4550 e20a8b6f 2019-06-04 stsp goto done;
4553 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4554 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4555 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4556 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4557 a129376b 2019-03-28 stsp goto done;
4560 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4561 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4562 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4563 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4564 a129376b 2019-03-28 stsp goto done;
4567 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4568 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4569 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4570 a129376b 2019-03-28 stsp goto done;
4575 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4576 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4577 a9fa2909 2019-07-27 stsp if (err) {
4578 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4579 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4580 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4581 a9fa2909 2019-07-27 stsp goto done;
4583 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4585 a9fa2909 2019-07-27 stsp goto done;
4587 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4589 a9fa2909 2019-07-27 stsp goto done;
4591 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4592 1233e6b6 2020-10-19 stsp free(te_name);
4593 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4594 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4595 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4596 a9fa2909 2019-07-27 stsp goto done;
4600 a129376b 2019-03-28 stsp switch (status) {
4601 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4602 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4603 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4604 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4605 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4607 33aa809d 2019-08-08 stsp goto done;
4608 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4611 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4612 1f1abb7e 2019-08-08 stsp ie->path);
4614 1ee397ad 2019-07-12 stsp goto done;
4615 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4616 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4617 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4618 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4619 f259c4c1 2021-09-24 stsp relpath) == -1) {
4620 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4621 f259c4c1 2021-09-24 stsp goto done;
4623 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4624 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4625 f259c4c1 2021-09-24 stsp ondisk_path);
4630 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4631 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4632 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4633 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4634 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4636 33aa809d 2019-08-08 stsp goto done;
4637 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4640 33aa809d 2019-08-08 stsp /* fall through */
4641 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4642 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4643 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4644 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4645 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4646 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4647 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4648 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4649 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4651 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4652 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4653 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4655 65084dad 2019-08-08 stsp goto done;
4657 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4658 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4659 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4660 a129376b 2019-03-28 stsp goto done;
4663 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4664 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4665 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4666 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4667 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4668 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4669 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4671 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4672 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4673 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4674 369fd7e5 2020-07-23 stsp path_content);
4677 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4678 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4679 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4680 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4682 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4683 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4684 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4685 369fd7e5 2020-07-23 stsp goto done;
4689 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4690 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4691 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4692 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4693 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4694 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4696 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4698 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4699 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4700 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4701 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4704 a129376b 2019-03-28 stsp goto done;
4705 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4706 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4707 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4708 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4709 437adc9d 2020-12-10 yzhong blob->id.sha1,
4710 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4712 2e1fa222 2020-07-23 stsp goto done;
4714 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4715 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4716 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4725 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4726 33aa809d 2019-08-08 stsp free(path_content);
4727 e20a8b6f 2019-06-04 stsp free(parent_path);
4728 a129376b 2019-03-28 stsp free(tree_path);
4730 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4732 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4733 a129376b 2019-03-28 stsp free(tree_id);
4734 e20a8b6f 2019-06-04 stsp return err;
4737 e20a8b6f 2019-06-04 stsp const struct got_error *
4738 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4739 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4740 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4741 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4742 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4744 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4745 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4746 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4747 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4748 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4749 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4751 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4753 e20a8b6f 2019-06-04 stsp return err;
4755 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4757 e20a8b6f 2019-06-04 stsp goto done;
4759 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4760 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4761 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4762 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4763 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4764 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4765 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4766 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4767 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4768 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4769 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
4773 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4774 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4775 e20a8b6f 2019-06-04 stsp err = sync_err;
4777 fb399478 2019-07-12 stsp free(fileindex_path);
4778 a129376b 2019-03-28 stsp if (fileindex)
4779 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4780 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4781 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4782 a129376b 2019-03-28 stsp err = unlockerr;
4783 c4296144 2019-05-09 stsp return err;
4786 cf066bf8 2019-05-09 stsp static void
4787 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4789 24519714 2019-05-09 stsp free(ct->path);
4790 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4791 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4792 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4793 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4794 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4795 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4799 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4800 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4801 24519714 2019-05-09 stsp struct got_repository *repo;
4802 24519714 2019-05-09 stsp struct got_worktree *worktree;
4803 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4804 5f8a88c6 2019-08-03 stsp int have_staged_files;
4805 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4808 c4296144 2019-05-09 stsp static const struct got_error *
4809 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4810 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4811 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4812 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4814 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4815 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4816 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4817 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4818 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4819 768aea60 2019-05-09 stsp struct stat sb;
4821 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4822 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4823 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4824 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4825 5f8a88c6 2019-08-03 stsp return NULL;
4827 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4828 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4830 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4831 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4832 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4833 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4834 5f8a88c6 2019-08-03 stsp return NULL;
4837 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4838 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4839 036813ee 2019-05-09 stsp goto done;
4841 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4842 036813ee 2019-05-09 stsp parent_path = strdup("");
4843 69960a46 2019-05-09 stsp if (parent_path == NULL)
4844 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4846 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4848 69960a46 2019-05-09 stsp return err;
4851 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4852 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4853 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4854 c4296144 2019-05-09 stsp goto done;
4857 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4858 768aea60 2019-05-09 stsp relpath) == -1) {
4859 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4860 768aea60 2019-05-09 stsp goto done;
4863 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4864 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4865 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4866 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4867 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4868 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4869 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4870 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4872 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4873 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4876 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4877 0aeb8099 2020-07-23 stsp goto done;
4879 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4880 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4881 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4882 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4883 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4884 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4885 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4886 12463d8b 2019-12-13 stsp ct->ondisk_path);
4887 12463d8b 2019-12-13 stsp goto done;
4889 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4890 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4891 768aea60 2019-05-09 stsp goto done;
4893 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4896 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4897 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4898 44d03001 2019-05-09 stsp relpath) == -1) {
4899 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4900 44d03001 2019-05-09 stsp goto done;
4903 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4904 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4905 35213c7c 2020-07-23 stsp int is_bad_symlink;
4906 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4907 35213c7c 2020-07-23 stsp ssize_t target_len;
4908 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4909 35213c7c 2020-07-23 stsp sizeof(target_path));
4910 35213c7c 2020-07-23 stsp if (target_len == -1) {
4911 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4912 35213c7c 2020-07-23 stsp ct->ondisk_path);
4913 35213c7c 2020-07-23 stsp goto done;
4915 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4916 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4918 35213c7c 2020-07-23 stsp goto done;
4919 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4920 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4921 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4922 35213c7c 2020-07-23 stsp goto done;
4927 cf066bf8 2019-05-09 stsp ct->status = status;
4928 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4929 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4930 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4931 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4932 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4933 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4934 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4935 b416585c 2019-05-13 stsp goto done;
4937 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4938 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4939 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4940 f0b75401 2019-08-03 stsp goto done;
4943 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4944 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4945 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4946 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4947 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4948 036813ee 2019-05-09 stsp goto done;
4951 24519714 2019-05-09 stsp ct->path = strdup(path);
4952 24519714 2019-05-09 stsp if (ct->path == NULL) {
4953 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4954 24519714 2019-05-09 stsp goto done;
4956 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4958 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4959 ed175427 2019-05-09 stsp free_commitable(ct);
4960 24519714 2019-05-09 stsp free(parent_path);
4961 036813ee 2019-05-09 stsp free(path);
4962 a129376b 2019-03-28 stsp return err;
4965 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4966 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4967 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4968 036813ee 2019-05-09 stsp struct got_repository *);
4970 ed175427 2019-05-09 stsp static const struct got_error *
4971 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4972 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4973 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4974 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4975 afa376bf 2019-05-09 stsp struct got_repository *repo)
4977 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4978 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4979 036813ee 2019-05-09 stsp char *subpath;
4981 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4982 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4983 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4985 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4987 ed175427 2019-05-09 stsp return err;
4989 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4990 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4991 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4992 036813ee 2019-05-09 stsp free(subpath);
4993 036813ee 2019-05-09 stsp return err;
4996 036813ee 2019-05-09 stsp static const struct got_error *
4997 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4999 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5000 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5002 036813ee 2019-05-09 stsp *match = 0;
5004 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5005 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5006 0f63689d 2019-05-10 stsp return NULL;
5009 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5011 0f63689d 2019-05-10 stsp return err;
5012 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5013 036813ee 2019-05-09 stsp free(ct_parent_path);
5014 036813ee 2019-05-09 stsp return err;
5017 768aea60 2019-05-09 stsp static mode_t
5018 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5020 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5021 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5023 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5026 036813ee 2019-05-09 stsp static const struct got_error *
5027 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5028 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5030 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5032 036813ee 2019-05-09 stsp *new_te = NULL;
5034 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5036 036813ee 2019-05-09 stsp goto done;
5038 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5040 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5041 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5042 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5044 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5046 036813ee 2019-05-09 stsp if (err && *new_te) {
5047 56e0773d 2019-11-28 stsp free(*new_te);
5048 036813ee 2019-05-09 stsp *new_te = NULL;
5050 036813ee 2019-05-09 stsp return err;
5053 036813ee 2019-05-09 stsp static const struct got_error *
5054 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5055 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5057 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5058 102b254e 2020-10-19 stsp char *ct_name = NULL;
5060 036813ee 2019-05-09 stsp *new_te = NULL;
5062 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5063 036813ee 2019-05-09 stsp if (*new_te == NULL)
5064 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5066 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5068 036813ee 2019-05-09 stsp goto done;
5069 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5070 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5071 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5072 036813ee 2019-05-09 stsp goto done;
5075 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5077 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5078 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5079 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5081 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5083 102b254e 2020-10-19 stsp free(ct_name);
5084 036813ee 2019-05-09 stsp if (err && *new_te) {
5085 56e0773d 2019-11-28 stsp free(*new_te);
5086 036813ee 2019-05-09 stsp *new_te = NULL;
5088 036813ee 2019-05-09 stsp return err;
5091 036813ee 2019-05-09 stsp static const struct got_error *
5092 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5093 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5095 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5096 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5098 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5100 036813ee 2019-05-09 stsp return err;
5101 036813ee 2019-05-09 stsp if (new_pe == NULL)
5102 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5103 036813ee 2019-05-09 stsp return NULL;
5106 afa376bf 2019-05-09 stsp static const struct got_error *
5107 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5108 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5110 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5111 5f8a88c6 2019-08-03 stsp unsigned char status;
5113 0ff8d236 2021-09-28 stsp if (status_cb == NULL) /* no commit progress output desired */
5114 0ff8d236 2021-09-28 stsp return NULL;
5116 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5117 afa376bf 2019-05-09 stsp ct_path++;
5119 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5120 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5122 5f8a88c6 2019-08-03 stsp status = ct->status;
5124 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5125 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5128 036813ee 2019-05-09 stsp static const struct got_error *
5129 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5130 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5132 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5133 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5134 44d03001 2019-05-09 stsp char *te_path;
5136 44d03001 2019-05-09 stsp *modified = 0;
5138 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5139 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5140 44d03001 2019-05-09 stsp te->name) == -1)
5141 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5143 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5144 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5145 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5146 44d03001 2019-05-09 stsp strlen(te_path));
5147 62d463ca 2020-10-20 naddy if (*modified)
5151 44d03001 2019-05-09 stsp free(te_path);
5152 44d03001 2019-05-09 stsp return err;
5155 44d03001 2019-05-09 stsp static const struct got_error *
5156 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5157 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5158 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5160 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5161 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5163 036813ee 2019-05-09 stsp *ctp = NULL;
5165 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5166 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5167 036813ee 2019-05-09 stsp char *ct_name = NULL;
5168 036813ee 2019-05-09 stsp int path_matches;
5170 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5171 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5172 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5173 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5176 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5177 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5181 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5184 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5186 036813ee 2019-05-09 stsp return err;
5187 036813ee 2019-05-09 stsp if (!path_matches)
5190 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5192 d34b633e 2020-10-19 stsp return err;
5194 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5195 d34b633e 2020-10-19 stsp free(ct_name);
5198 d34b633e 2020-10-19 stsp free(ct_name);
5200 036813ee 2019-05-09 stsp *ctp = ct;
5204 2b496619 2019-07-10 stsp return err;
5207 2b496619 2019-07-10 stsp static const struct got_error *
5208 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5209 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5210 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5211 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5212 2b496619 2019-07-10 stsp struct got_repository *repo)
5214 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5215 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5216 2b496619 2019-07-10 stsp char *subtree_path;
5217 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5218 ba580f68 2020-03-22 stsp int nentries;
5220 2b496619 2019-07-10 stsp *new_tep = NULL;
5222 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5223 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5224 2b496619 2019-07-10 stsp child_path) == -1)
5225 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5227 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5228 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5229 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5230 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5232 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5233 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5234 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5235 2b496619 2019-07-10 stsp goto done;
5237 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5238 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5239 2b496619 2019-07-10 stsp if (err) {
5240 56e0773d 2019-11-28 stsp free(new_te);
5241 2b496619 2019-07-10 stsp goto done;
5243 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5246 2b496619 2019-07-10 stsp free(subtree_path);
5247 2b496619 2019-07-10 stsp if (err == NULL)
5248 2b496619 2019-07-10 stsp *new_tep = new_te;
5249 036813ee 2019-05-09 stsp return err;
5252 036813ee 2019-05-09 stsp static const struct got_error *
5253 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5254 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5255 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5256 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5257 036813ee 2019-05-09 stsp struct got_repository *repo)
5259 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5260 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5261 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5262 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5264 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5265 ba580f68 2020-03-22 stsp *nentries = 0;
5267 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5268 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5269 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5270 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5272 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5273 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5274 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5277 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5278 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5281 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5282 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5284 036813ee 2019-05-09 stsp goto done;
5286 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5287 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5288 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5290 036813ee 2019-05-09 stsp goto done;
5291 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5293 afa376bf 2019-05-09 stsp goto done;
5294 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5295 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5297 2f51b5b3 2019-05-09 stsp goto done;
5298 ba580f68 2020-03-22 stsp (*nentries)++;
5300 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5301 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5302 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5303 2b496619 2019-07-10 stsp == NULL) {
5304 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5305 2b496619 2019-07-10 stsp child_path, path_base_tree,
5306 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5309 2b496619 2019-07-10 stsp goto done;
5310 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5312 2b496619 2019-07-10 stsp goto done;
5313 ba580f68 2020-03-22 stsp (*nentries)++;
5318 2f51b5b3 2019-05-09 stsp if (base_tree) {
5319 56e0773d 2019-11-28 stsp int i, nbase_entries;
5320 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5321 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5322 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5323 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5325 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5326 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5327 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5328 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5330 63c5ca5d 2019-08-24 stsp goto done;
5331 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5333 63c5ca5d 2019-08-24 stsp goto done;
5334 ba580f68 2020-03-22 stsp (*nentries)++;
5338 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5339 44d03001 2019-05-09 stsp int modified;
5340 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5342 036813ee 2019-05-09 stsp goto done;
5343 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5344 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5346 2f51b5b3 2019-05-09 stsp goto done;
5347 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5348 44d03001 2019-05-09 stsp if (modified) {
5349 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5350 ba580f68 2020-03-22 stsp int nsubentries;
5351 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5352 ba580f68 2020-03-22 stsp &nsubentries, te,
5353 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5354 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5356 44d03001 2019-05-09 stsp goto done;
5357 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5358 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5359 ba580f68 2020-03-22 stsp free(new_id);
5362 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5363 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5364 56e0773d 2019-11-28 stsp free(new_id);
5366 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5368 036813ee 2019-05-09 stsp goto done;
5369 ba580f68 2020-03-22 stsp (*nentries)++;
5373 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5374 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5376 f66c734c 2019-09-22 stsp goto done;
5378 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5379 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5380 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5381 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5382 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5383 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5385 2f51b5b3 2019-05-09 stsp goto done;
5386 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5388 2f51b5b3 2019-05-09 stsp goto done;
5389 ba580f68 2020-03-22 stsp (*nentries)++;
5391 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5392 b416585c 2019-05-13 stsp status_arg);
5394 afa376bf 2019-05-09 stsp goto done;
5396 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5397 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5399 2f51b5b3 2019-05-09 stsp goto done;
5400 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5402 2f51b5b3 2019-05-09 stsp goto done;
5403 ba580f68 2020-03-22 stsp (*nentries)++;
5408 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5409 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5411 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5412 2e1fa222 2020-07-23 stsp return err;
5415 2e1fa222 2020-07-23 stsp static const struct got_error *
5416 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5417 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5418 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5419 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5421 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5422 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5423 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5425 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5426 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5427 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5429 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5431 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5432 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5433 437adc9d 2020-12-10 yzhong if (err)
5434 437adc9d 2020-12-10 yzhong goto done;
5437 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5438 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5439 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5440 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5441 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5442 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5443 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5444 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5446 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5447 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5448 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5449 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5450 72fd46fa 2019-09-06 stsp !have_staged_files);
5452 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5453 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5454 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5455 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5456 72fd46fa 2019-09-06 stsp !have_staged_files);
5458 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5460 437adc9d 2020-12-10 yzhong goto done;
5461 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5462 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5463 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
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;
5468 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5469 3969253a 2020-03-07 stsp if (err) {
5470 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5471 437adc9d 2020-12-10 yzhong goto done;
5474 437adc9d 2020-12-10 yzhong free(relpath);
5475 437adc9d 2020-12-10 yzhong relpath = NULL;
5478 437adc9d 2020-12-10 yzhong free(relpath);
5479 d56d26ce 2019-05-10 stsp return err;
5483 d56d26ce 2019-05-10 stsp static const struct got_error *
5484 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5485 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5486 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5487 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5488 735ef5ac 2019-08-03 stsp int ood_errcode)
5490 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5491 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5493 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5494 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5495 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5496 1a36436d 2019-06-10 stsp return NULL;
5498 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5499 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5501 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5502 735ef5ac 2019-08-03 stsp in_repo_path);
5503 9bead371 2019-07-28 stsp if (err) {
5504 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5505 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5506 1a36436d 2019-06-10 stsp goto done;
5507 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5508 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5510 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5511 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5512 735ef5ac 2019-08-03 stsp in_repo_path);
5513 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5514 1a36436d 2019-06-10 stsp goto done;
5515 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5519 1a36436d 2019-06-10 stsp return err;
5522 c4296144 2019-05-09 stsp const struct got_error *
5523 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5524 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5525 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5526 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5527 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5528 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5529 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5530 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5531 afa376bf 2019-05-09 stsp struct got_repository *repo)
5533 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5534 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5535 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5536 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5537 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5538 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5539 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5540 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5541 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5542 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5543 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5544 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5546 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5548 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5550 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5552 588edf97 2019-05-10 stsp goto done;
5554 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5556 588edf97 2019-05-10 stsp goto done;
5558 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5559 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5564 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5565 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5569 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5570 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5571 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5572 cf066bf8 2019-05-09 stsp char *ondisk_path;
5574 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5575 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5576 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5579 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5580 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5581 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5584 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5585 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5586 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5587 cf066bf8 2019-05-09 stsp goto done;
5589 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5590 2e1fa222 2020-07-23 stsp free(ondisk_path);
5592 cf066bf8 2019-05-09 stsp goto done;
5595 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5596 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5597 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5599 036813ee 2019-05-09 stsp goto done;
5601 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5603 de18fc63 2019-05-09 stsp goto done;
5604 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5605 f259c4c1 2021-09-24 stsp nparents++;
5606 f259c4c1 2021-09-24 stsp if (parent_id2) {
5607 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
5609 f259c4c1 2021-09-24 stsp goto done;
5610 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5611 f259c4c1 2021-09-24 stsp nparents++;
5613 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5614 f259c4c1 2021-09-24 stsp nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5615 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5616 33ad4cbe 2019-05-12 jcs free(logmsg);
5618 9d40349a 2019-05-09 stsp goto done;
5620 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5621 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5622 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5623 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5624 09f5bd90 2019-05-09 stsp goto done;
5626 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5627 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5629 09f5bd90 2019-05-09 stsp goto done;
5630 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5632 ebf99748 2019-05-09 stsp goto done;
5633 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5634 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5635 09f5bd90 2019-05-09 stsp goto done;
5637 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5638 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5640 f2c16586 2019-05-09 stsp goto done;
5641 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5643 f2c16586 2019-05-09 stsp goto done;
5645 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5647 09f5bd90 2019-05-09 stsp goto done;
5649 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5651 ebf99748 2019-05-09 stsp goto done;
5653 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
5654 588edf97 2019-05-10 stsp if (head_tree)
5655 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5656 588edf97 2019-05-10 stsp if (head_commit)
5657 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5658 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5659 2f17228e 2019-05-12 stsp if (head_ref2) {
5660 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5661 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5662 2f17228e 2019-05-12 stsp err = unlockerr;
5663 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5665 39cd0ff6 2019-07-12 stsp return err;
5668 5c1e53bc 2019-07-28 stsp static const struct got_error *
5669 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5670 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5672 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5673 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5675 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5676 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5677 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5679 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5680 5c1e53bc 2019-07-28 stsp ct_path++;
5682 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5683 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5687 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5688 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5690 5c1e53bc 2019-07-28 stsp return NULL;
5693 f0b75401 2019-08-03 stsp static const struct got_error *
5694 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5696 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5698 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5699 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5700 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5703 f0b75401 2019-08-03 stsp return NULL;
5706 5f8a88c6 2019-08-03 stsp static const struct got_error *
5707 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5708 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5710 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5711 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5713 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5714 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5716 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5717 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5718 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5719 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5720 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5721 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5724 5f8a88c6 2019-08-03 stsp return NULL;
5727 39cd0ff6 2019-07-12 stsp const struct got_error *
5728 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5729 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5730 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5731 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5732 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5733 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5735 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5736 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5737 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5738 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5739 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5740 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5741 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5742 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5743 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5745 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5747 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5749 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5751 39cd0ff6 2019-07-12 stsp goto done;
5753 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5755 39cd0ff6 2019-07-12 stsp goto done;
5757 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5759 39cd0ff6 2019-07-12 stsp goto done;
5761 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5763 39cd0ff6 2019-07-12 stsp goto done;
5765 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5766 5f8a88c6 2019-08-03 stsp &have_staged_files);
5767 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5768 5f8a88c6 2019-08-03 stsp goto done;
5769 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5770 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5772 5f8a88c6 2019-08-03 stsp goto done;
5775 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5776 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5777 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5778 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5779 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5780 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5781 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5782 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5783 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
5785 5c1e53bc 2019-07-28 stsp goto done;
5788 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5789 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5790 39cd0ff6 2019-07-12 stsp goto done;
5793 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5794 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5796 5c1e53bc 2019-07-28 stsp goto done;
5799 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5800 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5801 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5803 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5804 f0b75401 2019-08-03 stsp ct_path++;
5805 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5806 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5807 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5809 b50cabdf 2019-07-12 stsp goto done;
5813 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5814 f259c4c1 2021-09-24 stsp head_commit_id, NULL, worktree, author, committer,
5815 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5817 39cd0ff6 2019-07-12 stsp goto done;
5819 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5820 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5821 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5822 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5823 39cd0ff6 2019-07-12 stsp err = sync_err;
5825 39cd0ff6 2019-07-12 stsp if (fileindex)
5826 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5827 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5828 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5829 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5830 39cd0ff6 2019-07-12 stsp err = unlockerr;
5831 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5832 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5833 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5835 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5836 c4296144 2019-05-09 stsp return err;
5839 8656d6c4 2019-05-20 stsp const char *
5840 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5842 8656d6c4 2019-05-20 stsp return ct->path;
5845 8656d6c4 2019-05-20 stsp unsigned int
5846 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5848 8656d6c4 2019-05-20 stsp return ct->status;
5851 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5852 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5853 818c7501 2019-07-11 stsp struct got_repository *repo;
5856 818c7501 2019-07-11 stsp static const struct got_error *
5857 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5859 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5860 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5861 818c7501 2019-07-11 stsp unsigned char status;
5862 818c7501 2019-07-11 stsp struct stat sb;
5863 818c7501 2019-07-11 stsp char *ondisk_path;
5865 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5866 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5867 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5868 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5870 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5872 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5874 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5875 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5876 818c7501 2019-07-11 stsp free(ondisk_path);
5878 818c7501 2019-07-11 stsp return err;
5880 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5881 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5882 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5883 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5885 818c7501 2019-07-11 stsp return NULL;
5888 818c7501 2019-07-11 stsp const struct got_error *
5889 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5890 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5891 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5892 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5894 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5895 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5896 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5897 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5898 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5899 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5900 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5902 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5903 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5904 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5906 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5908 818c7501 2019-07-11 stsp return err;
5910 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5912 818c7501 2019-07-11 stsp goto done;
5914 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5915 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5916 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5919 818c7501 2019-07-11 stsp goto done;
5921 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5923 818c7501 2019-07-11 stsp goto done;
5925 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5927 818c7501 2019-07-11 stsp goto done;
5929 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5931 818c7501 2019-07-11 stsp goto done;
5933 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5936 e51d7b55 2020-01-04 stsp goto done;
5938 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5940 818c7501 2019-07-11 stsp goto done;
5941 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5942 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5943 e51d7b55 2020-01-04 stsp goto done;
5946 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5947 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5949 818c7501 2019-07-11 stsp goto done;
5950 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5952 818c7501 2019-07-11 stsp goto done;
5954 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5956 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5958 818c7501 2019-07-11 stsp goto done;
5960 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5962 818c7501 2019-07-11 stsp goto done;
5964 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5965 818c7501 2019-07-11 stsp worktree->base_commit_id);
5967 818c7501 2019-07-11 stsp goto done;
5968 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5970 818c7501 2019-07-11 stsp goto done;
5972 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5974 818c7501 2019-07-11 stsp goto done;
5976 818c7501 2019-07-11 stsp free(fileindex_path);
5977 818c7501 2019-07-11 stsp free(tmp_branch_name);
5978 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5979 818c7501 2019-07-11 stsp free(branch_ref_name);
5980 818c7501 2019-07-11 stsp if (branch_ref)
5981 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5982 818c7501 2019-07-11 stsp if (wt_branch)
5983 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5984 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5985 818c7501 2019-07-11 stsp if (err) {
5986 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5987 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5988 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5990 818c7501 2019-07-11 stsp if (*tmp_branch) {
5991 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5992 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5994 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5995 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5996 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5998 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6000 818c7501 2019-07-11 stsp return err;
6003 818c7501 2019-07-11 stsp const struct got_error *
6004 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6005 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6006 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6007 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6009 818c7501 2019-07-11 stsp const struct got_error *err;
6010 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6011 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6012 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6013 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6014 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6016 818c7501 2019-07-11 stsp *commit_id = NULL;
6017 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6018 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6019 3e3a69f1 2019-07-25 stsp *branch = NULL;
6020 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6022 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6024 3e3a69f1 2019-07-25 stsp return err;
6026 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6028 f032f1f7 2019-08-04 stsp goto done;
6030 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6031 f032f1f7 2019-08-04 stsp &have_staged_files);
6032 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6033 f032f1f7 2019-08-04 stsp goto done;
6034 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6035 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6036 3e3a69f1 2019-07-25 stsp goto done;
6039 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6041 f032f1f7 2019-08-04 stsp goto done;
6043 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6045 818c7501 2019-07-11 stsp goto done;
6047 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6049 818c7501 2019-07-11 stsp goto done;
6051 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6053 818c7501 2019-07-11 stsp goto done;
6055 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6057 818c7501 2019-07-11 stsp goto done;
6059 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6060 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6062 818c7501 2019-07-11 stsp goto done;
6064 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6066 818c7501 2019-07-11 stsp goto done;
6068 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6070 818c7501 2019-07-11 stsp goto done;
6072 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6073 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6075 818c7501 2019-07-11 stsp goto done;
6077 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6079 818c7501 2019-07-11 stsp goto done;
6081 818c7501 2019-07-11 stsp free(commit_ref_name);
6082 818c7501 2019-07-11 stsp free(branch_ref_name);
6083 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6084 818c7501 2019-07-11 stsp if (commit_ref)
6085 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6086 818c7501 2019-07-11 stsp if (branch_ref)
6087 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6088 818c7501 2019-07-11 stsp if (err) {
6089 818c7501 2019-07-11 stsp free(*commit_id);
6090 818c7501 2019-07-11 stsp *commit_id = NULL;
6091 818c7501 2019-07-11 stsp if (*tmp_branch) {
6092 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6093 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6095 818c7501 2019-07-11 stsp if (*new_base_branch) {
6096 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6097 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6099 818c7501 2019-07-11 stsp if (*branch) {
6100 818c7501 2019-07-11 stsp got_ref_close(*branch);
6101 818c7501 2019-07-11 stsp *branch = NULL;
6103 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6104 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6105 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6107 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6109 818c7501 2019-07-11 stsp return err;
6112 818c7501 2019-07-11 stsp const struct got_error *
6113 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6115 818c7501 2019-07-11 stsp const struct got_error *err;
6116 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6118 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6120 818c7501 2019-07-11 stsp return err;
6122 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6123 818c7501 2019-07-11 stsp free(tmp_branch_name);
6124 818c7501 2019-07-11 stsp return NULL;
6127 818c7501 2019-07-11 stsp static const struct got_error *
6128 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6129 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6131 0ebf8283 2019-07-24 stsp *logmsg = arg;
6132 818c7501 2019-07-11 stsp return NULL;
6135 818c7501 2019-07-11 stsp static const struct got_error *
6136 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6137 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6138 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6139 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6141 818c7501 2019-07-11 stsp return NULL;
6144 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6145 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6146 01757395 2019-07-12 stsp void *progress_arg;
6147 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6150 01757395 2019-07-12 stsp static const struct got_error *
6151 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6153 01757395 2019-07-12 stsp const struct got_error *err;
6154 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6156 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6158 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6160 01757395 2019-07-12 stsp return err;
6162 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6163 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6164 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6165 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6166 01757395 2019-07-12 stsp return NULL;
6168 01757395 2019-07-12 stsp p = strdup(path);
6169 01757395 2019-07-12 stsp if (p == NULL)
6170 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6172 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6173 01757395 2019-07-12 stsp if (err || new == NULL)
6175 01757395 2019-07-12 stsp return err;
6179 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6181 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6183 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6184 01757395 2019-07-12 stsp free((char *)pe->path);
6186 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6189 0ebf8283 2019-07-24 stsp static const struct got_error *
6190 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6191 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6193 818c7501 2019-07-11 stsp const struct got_error *err;
6194 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6196 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6197 818c7501 2019-07-11 stsp if (err) {
6198 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6199 818c7501 2019-07-11 stsp goto done;
6200 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6202 818c7501 2019-07-11 stsp goto done;
6203 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6205 818c7501 2019-07-11 stsp goto done;
6206 de05890f 2020-03-05 stsp } else if (is_rebase) {
6207 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6210 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6212 818c7501 2019-07-11 stsp goto done;
6213 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6214 818c7501 2019-07-11 stsp free(stored_id);
6215 818c7501 2019-07-11 stsp if (cmp != 0) {
6216 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6217 818c7501 2019-07-11 stsp goto done;
6221 0ebf8283 2019-07-24 stsp if (commit_ref)
6222 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6223 0ebf8283 2019-07-24 stsp return err;
6226 0ebf8283 2019-07-24 stsp static const struct got_error *
6227 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6228 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6229 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6230 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6231 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6232 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6234 0ebf8283 2019-07-24 stsp const struct got_error *err;
6235 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6236 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6237 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6239 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6241 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6243 0ebf8283 2019-07-24 stsp return err;
6245 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6246 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6247 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6248 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6249 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6250 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6251 818c7501 2019-07-11 stsp if (commit_ref)
6252 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6253 818c7501 2019-07-11 stsp return err;
6256 818c7501 2019-07-11 stsp const struct got_error *
6257 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6258 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6259 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6260 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6261 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6262 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6264 0ebf8283 2019-07-24 stsp const struct got_error *err;
6265 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6267 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6269 0ebf8283 2019-07-24 stsp return err;
6271 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6273 0ebf8283 2019-07-24 stsp goto done;
6275 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6276 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6277 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6279 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6280 0ebf8283 2019-07-24 stsp return err;
6283 0ebf8283 2019-07-24 stsp const struct got_error *
6284 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6285 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6286 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6287 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6288 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6289 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6291 0ebf8283 2019-07-24 stsp const struct got_error *err;
6292 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6294 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6296 0ebf8283 2019-07-24 stsp return err;
6298 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6300 0ebf8283 2019-07-24 stsp goto done;
6302 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6303 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6304 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6306 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6307 0ebf8283 2019-07-24 stsp return err;
6310 0ebf8283 2019-07-24 stsp static const struct got_error *
6311 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6312 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6313 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6314 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6315 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6317 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6318 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6319 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6320 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6321 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6322 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6323 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6325 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6326 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6328 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6330 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6332 3e3a69f1 2019-07-25 stsp return err;
6334 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6335 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6336 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6337 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6339 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6340 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6342 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6343 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6344 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6345 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6346 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6347 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6349 01757395 2019-07-12 stsp if (merged_paths) {
6350 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6351 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6352 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6353 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6356 01757395 2019-07-12 stsp goto done;
6359 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6360 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6362 01757395 2019-07-12 stsp goto done;
6365 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6366 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6367 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6369 a0e95631 2019-07-12 stsp goto done;
6370 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6371 a0e95631 2019-07-12 stsp goto done;
6374 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6376 edd02c5e 2019-07-11 stsp goto done;
6378 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6380 818c7501 2019-07-11 stsp goto done;
6382 5943eee2 2019-08-13 stsp if (new_logmsg) {
6383 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6384 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6385 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6386 5943eee2 2019-08-13 stsp goto done;
6389 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6391 5943eee2 2019-08-13 stsp goto done;
6394 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6395 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6396 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6397 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6398 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6400 a0e95631 2019-07-12 stsp goto done;
6402 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6404 a0e95631 2019-07-12 stsp goto done;
6406 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6408 a0e95631 2019-07-12 stsp goto done;
6410 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6411 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6412 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6413 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6414 a0e95631 2019-07-12 stsp err = sync_err;
6416 a0e95631 2019-07-12 stsp free(fileindex_path);
6417 a0e95631 2019-07-12 stsp free(head_commit_id);
6418 a0e95631 2019-07-12 stsp if (head_ref)
6419 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6420 818c7501 2019-07-11 stsp if (err) {
6421 818c7501 2019-07-11 stsp free(*new_commit_id);
6422 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6424 818c7501 2019-07-11 stsp return err;
6427 818c7501 2019-07-11 stsp const struct got_error *
6428 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6429 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6430 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6431 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6432 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6434 0ebf8283 2019-07-24 stsp const struct got_error *err;
6435 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6436 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6437 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6439 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6441 0ebf8283 2019-07-24 stsp return err;
6443 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6445 0ebf8283 2019-07-24 stsp goto done;
6446 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6448 0ebf8283 2019-07-24 stsp goto done;
6449 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6450 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6451 0ebf8283 2019-07-24 stsp goto done;
6454 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6455 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6457 0ebf8283 2019-07-24 stsp if (commit_ref)
6458 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6459 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6460 0ebf8283 2019-07-24 stsp free(commit_id);
6461 0ebf8283 2019-07-24 stsp return err;
6464 0ebf8283 2019-07-24 stsp const struct got_error *
6465 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6466 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6467 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6468 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6469 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6470 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6472 0ebf8283 2019-07-24 stsp const struct got_error *err;
6473 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6474 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6476 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6478 0ebf8283 2019-07-24 stsp return err;
6480 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6482 0ebf8283 2019-07-24 stsp goto done;
6484 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6485 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6487 0ebf8283 2019-07-24 stsp if (commit_ref)
6488 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6489 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6490 0ebf8283 2019-07-24 stsp return err;
6493 0ebf8283 2019-07-24 stsp const struct got_error *
6494 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6495 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6497 3e3a69f1 2019-07-25 stsp if (fileindex)
6498 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6499 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6502 69844fba 2019-07-11 stsp static const struct got_error *
6503 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6505 69844fba 2019-07-11 stsp const struct got_error *err;
6506 69844fba 2019-07-11 stsp struct got_reference *ref;
6508 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6509 69844fba 2019-07-11 stsp if (err) {
6510 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6511 69844fba 2019-07-11 stsp return NULL;
6512 69844fba 2019-07-11 stsp return err;
6515 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6516 69844fba 2019-07-11 stsp got_ref_close(ref);
6517 69844fba 2019-07-11 stsp return err;
6520 69844fba 2019-07-11 stsp static const struct got_error *
6521 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6523 69844fba 2019-07-11 stsp const struct got_error *err;
6524 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6525 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6527 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6529 69844fba 2019-07-11 stsp goto done;
6530 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6532 69844fba 2019-07-11 stsp goto done;
6534 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6536 69844fba 2019-07-11 stsp goto done;
6537 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6539 69844fba 2019-07-11 stsp goto done;
6541 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6543 69844fba 2019-07-11 stsp goto done;
6544 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6546 69844fba 2019-07-11 stsp goto done;
6548 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6550 69844fba 2019-07-11 stsp goto done;
6551 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6553 69844fba 2019-07-11 stsp goto done;
6556 69844fba 2019-07-11 stsp free(tmp_branch_name);
6557 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6558 69844fba 2019-07-11 stsp free(branch_ref_name);
6559 69844fba 2019-07-11 stsp free(commit_ref_name);
6560 e600f124 2021-03-21 stsp return err;
6563 e600f124 2021-03-21 stsp const struct got_error *
6564 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6565 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6567 e600f124 2021-03-21 stsp const struct got_error *err;
6568 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6569 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6570 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6571 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6572 e600f124 2021-03-21 stsp char *refname = NULL;
6574 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6575 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6576 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6577 e600f124 2021-03-21 stsp branch_name += 11;
6579 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6581 e600f124 2021-03-21 stsp return err;
6583 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6584 e600f124 2021-03-21 stsp new_id_str) == -1) {
6585 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6586 e600f124 2021-03-21 stsp goto done;
6589 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6591 e600f124 2021-03-21 stsp goto done;
6593 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6595 e600f124 2021-03-21 stsp goto done;
6597 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6599 e600f124 2021-03-21 stsp free(new_id_str);
6600 e600f124 2021-03-21 stsp free(refname);
6601 e600f124 2021-03-21 stsp free(old_commit_id);
6603 e600f124 2021-03-21 stsp got_ref_close(ref);
6604 69844fba 2019-07-11 stsp return err;
6607 818c7501 2019-07-11 stsp const struct got_error *
6608 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6609 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6610 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6611 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6613 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6614 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6615 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6617 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6619 818c7501 2019-07-11 stsp return err;
6621 e600f124 2021-03-21 stsp if (create_backup) {
6622 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6623 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6625 e600f124 2021-03-21 stsp goto done;
6628 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6630 818c7501 2019-07-11 stsp goto done;
6632 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6634 818c7501 2019-07-11 stsp goto done;
6636 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6638 818c7501 2019-07-11 stsp goto done;
6640 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6642 a615e0e7 2020-12-16 stsp goto done;
6644 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6646 a615e0e7 2020-12-16 stsp goto done;
6647 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6648 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6649 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6650 a615e0e7 2020-12-16 stsp err = sync_err;
6652 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6653 a615e0e7 2020-12-16 stsp free(fileindex_path);
6654 818c7501 2019-07-11 stsp free(new_head_commit_id);
6655 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6656 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6657 818c7501 2019-07-11 stsp err = unlockerr;
6658 818c7501 2019-07-11 stsp return err;
6661 818c7501 2019-07-11 stsp const struct got_error *
6662 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6663 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6664 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6665 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6667 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6668 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6669 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6670 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6671 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6672 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6674 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6676 818c7501 2019-07-11 stsp return err;
6678 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6679 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6681 818c7501 2019-07-11 stsp goto done;
6683 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6685 818c7501 2019-07-11 stsp goto done;
6688 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6689 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6690 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6692 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6694 818c7501 2019-07-11 stsp goto done;
6696 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6698 818c7501 2019-07-11 stsp goto done;
6700 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6701 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6703 ca355955 2019-07-12 stsp goto done;
6705 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6707 ca355955 2019-07-12 stsp goto done;
6709 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6711 818c7501 2019-07-11 stsp goto done;
6713 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6714 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6715 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6716 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6717 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6718 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6719 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6720 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
6721 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6722 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
6724 1f1abb7e 2019-08-08 stsp goto sync;
6726 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6727 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6729 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6730 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6731 ca355955 2019-07-12 stsp err = sync_err;
6733 818c7501 2019-07-11 stsp got_ref_close(resolved);
6734 a3a2faf2 2019-07-12 stsp free(tree_id);
6735 818c7501 2019-07-11 stsp free(commit_id);
6736 0ebf8283 2019-07-24 stsp if (fileindex)
6737 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6738 0ebf8283 2019-07-24 stsp free(fileindex_path);
6740 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6741 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6742 0ebf8283 2019-07-24 stsp err = unlockerr;
6743 0ebf8283 2019-07-24 stsp return err;
6746 0ebf8283 2019-07-24 stsp const struct got_error *
6747 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6748 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6749 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6750 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6752 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6753 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6754 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6755 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6756 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6757 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6758 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6759 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6761 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6762 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6763 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6764 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6766 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6768 0ebf8283 2019-07-24 stsp return err;
6770 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6772 0ebf8283 2019-07-24 stsp goto done;
6774 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6775 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6776 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6779 0ebf8283 2019-07-24 stsp goto done;
6781 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6783 0ebf8283 2019-07-24 stsp goto done;
6785 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6787 0ebf8283 2019-07-24 stsp goto done;
6789 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6790 0ebf8283 2019-07-24 stsp worktree);
6792 0ebf8283 2019-07-24 stsp goto done;
6794 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6797 0ebf8283 2019-07-24 stsp goto done;
6799 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6801 0ebf8283 2019-07-24 stsp goto done;
6803 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6805 0ebf8283 2019-07-24 stsp goto done;
6807 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6808 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6810 0ebf8283 2019-07-24 stsp goto done;
6811 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6813 0ebf8283 2019-07-24 stsp goto done;
6814 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6815 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6816 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6817 0ebf8283 2019-07-24 stsp goto done;
6820 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6821 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6823 0ebf8283 2019-07-24 stsp goto done;
6824 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6826 0ebf8283 2019-07-24 stsp goto done;
6828 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6830 0ebf8283 2019-07-24 stsp goto done;
6832 0ebf8283 2019-07-24 stsp free(fileindex_path);
6833 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6834 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6835 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6836 0ebf8283 2019-07-24 stsp if (wt_branch)
6837 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6838 0ebf8283 2019-07-24 stsp if (err) {
6839 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6840 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6841 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6843 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6844 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6845 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6847 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6848 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6849 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6850 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6852 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6854 0ebf8283 2019-07-24 stsp return err;
6857 0ebf8283 2019-07-24 stsp const struct got_error *
6858 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6859 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6861 3e3a69f1 2019-07-25 stsp if (fileindex)
6862 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6863 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6866 0ebf8283 2019-07-24 stsp const struct got_error *
6867 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6868 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6870 0ebf8283 2019-07-24 stsp const struct got_error *err;
6871 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6873 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6875 0ebf8283 2019-07-24 stsp return err;
6877 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6878 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6879 0ebf8283 2019-07-24 stsp return NULL;
6882 0ebf8283 2019-07-24 stsp const struct got_error *
6883 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6884 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6885 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6886 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6888 0ebf8283 2019-07-24 stsp const struct got_error *err;
6889 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6890 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6891 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6892 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6893 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6894 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6896 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6897 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6898 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6899 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6901 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6903 3e3a69f1 2019-07-25 stsp return err;
6905 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6907 f032f1f7 2019-08-04 stsp goto done;
6909 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6910 f032f1f7 2019-08-04 stsp &have_staged_files);
6911 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6912 f032f1f7 2019-08-04 stsp goto done;
6913 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6914 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6915 3e3a69f1 2019-07-25 stsp goto done;
6918 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6920 f032f1f7 2019-08-04 stsp goto done;
6922 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6924 0ebf8283 2019-07-24 stsp goto done;
6926 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6928 0ebf8283 2019-07-24 stsp goto done;
6930 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6931 0ebf8283 2019-07-24 stsp worktree);
6933 0ebf8283 2019-07-24 stsp goto done;
6935 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6937 0ebf8283 2019-07-24 stsp goto done;
6939 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6941 0ebf8283 2019-07-24 stsp goto done;
6942 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6944 0ebf8283 2019-07-24 stsp goto done;
6946 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6948 0ebf8283 2019-07-24 stsp goto done;
6949 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6951 0ebf8283 2019-07-24 stsp goto done;
6953 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6955 0ebf8283 2019-07-24 stsp goto done;
6957 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6958 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6959 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6960 0ebf8283 2019-07-24 stsp if (commit_ref)
6961 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6962 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6963 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6964 0ebf8283 2019-07-24 stsp if (err) {
6965 0ebf8283 2019-07-24 stsp free(*commit_id);
6966 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6967 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6968 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6969 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6970 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6971 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6973 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6974 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6975 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6977 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6979 0ebf8283 2019-07-24 stsp return err;
6982 0ebf8283 2019-07-24 stsp static const struct got_error *
6983 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6985 0ebf8283 2019-07-24 stsp const struct got_error *err;
6986 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6987 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6989 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6991 0ebf8283 2019-07-24 stsp goto done;
6992 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6994 0ebf8283 2019-07-24 stsp goto done;
6996 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6997 0ebf8283 2019-07-24 stsp worktree);
6999 0ebf8283 2019-07-24 stsp goto done;
7000 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7002 0ebf8283 2019-07-24 stsp goto done;
7004 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7006 0ebf8283 2019-07-24 stsp goto done;
7007 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7009 0ebf8283 2019-07-24 stsp goto done;
7011 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7013 0ebf8283 2019-07-24 stsp goto done;
7014 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7016 0ebf8283 2019-07-24 stsp goto done;
7018 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7019 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7020 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7021 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7022 0ebf8283 2019-07-24 stsp return err;
7025 0ebf8283 2019-07-24 stsp const struct got_error *
7026 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7027 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7028 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7029 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7031 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7032 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7033 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7034 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7035 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7037 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7039 0ebf8283 2019-07-24 stsp return err;
7041 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7042 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7044 0ebf8283 2019-07-24 stsp goto done;
7046 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7048 0ebf8283 2019-07-24 stsp goto done;
7050 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7052 0ebf8283 2019-07-24 stsp goto done;
7054 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7055 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7057 0ebf8283 2019-07-24 stsp goto done;
7059 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7061 0ebf8283 2019-07-24 stsp goto done;
7063 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7065 0ebf8283 2019-07-24 stsp goto done;
7067 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7068 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7069 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7070 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7071 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7072 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7073 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7074 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7075 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7076 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7078 1f1abb7e 2019-08-08 stsp goto sync;
7080 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7081 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7083 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7084 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7085 0ebf8283 2019-07-24 stsp err = sync_err;
7087 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7088 0ebf8283 2019-07-24 stsp free(tree_id);
7089 818c7501 2019-07-11 stsp free(fileindex_path);
7091 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7092 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7093 818c7501 2019-07-11 stsp err = unlockerr;
7094 818c7501 2019-07-11 stsp return err;
7097 0ebf8283 2019-07-24 stsp const struct got_error *
7098 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7099 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7100 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7102 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7103 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7104 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7105 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7107 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7109 0ebf8283 2019-07-24 stsp return err;
7111 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7112 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7114 e600f124 2021-03-21 stsp goto done;
7116 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7117 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7119 0ebf8283 2019-07-24 stsp goto done;
7121 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7123 0ebf8283 2019-07-24 stsp goto done;
7125 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7127 0ebf8283 2019-07-24 stsp goto done;
7129 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7131 0ebf8283 2019-07-24 stsp goto done;
7133 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7135 a615e0e7 2020-12-16 stsp goto done;
7137 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7139 a615e0e7 2020-12-16 stsp goto done;
7140 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7141 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7142 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7143 a615e0e7 2020-12-16 stsp err = sync_err;
7145 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7146 a615e0e7 2020-12-16 stsp free(fileindex_path);
7147 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7148 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7149 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7150 0ebf8283 2019-07-24 stsp err = unlockerr;
7151 0ebf8283 2019-07-24 stsp return err;
7154 0ebf8283 2019-07-24 stsp const struct got_error *
7155 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7156 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7158 0ebf8283 2019-07-24 stsp const struct got_error *err;
7159 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7161 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7163 0ebf8283 2019-07-24 stsp return err;
7165 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7167 0ebf8283 2019-07-24 stsp goto done;
7169 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7171 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7172 2822a352 2019-10-15 stsp return err;
7175 2822a352 2019-10-15 stsp const struct got_error *
7176 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7177 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7178 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7179 2822a352 2019-10-15 stsp struct got_repository *repo)
7181 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7182 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7183 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7185 2822a352 2019-10-15 stsp *fileindex = NULL;
7186 2822a352 2019-10-15 stsp *branch_ref = NULL;
7187 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7189 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7191 2822a352 2019-10-15 stsp return err;
7193 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7194 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7195 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7196 2822a352 2019-10-15 stsp "update -b or different branch name required");
7197 2822a352 2019-10-15 stsp goto done;
7200 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7202 2822a352 2019-10-15 stsp goto done;
7204 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7205 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7206 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7207 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7210 2822a352 2019-10-15 stsp goto done;
7212 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7214 2822a352 2019-10-15 stsp goto done;
7216 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7217 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7219 2822a352 2019-10-15 stsp if (err) {
7220 2822a352 2019-10-15 stsp if (*branch_ref) {
7221 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7222 2822a352 2019-10-15 stsp *branch_ref = NULL;
7224 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7225 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7226 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7228 2822a352 2019-10-15 stsp if (*fileindex) {
7229 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7230 2822a352 2019-10-15 stsp *fileindex = NULL;
7232 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7234 0cb83759 2019-08-03 stsp return err;
7237 2822a352 2019-10-15 stsp const struct got_error *
7238 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7239 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7240 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7241 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7242 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7244 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7245 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7246 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7248 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7250 2822a352 2019-10-15 stsp goto done;
7252 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7254 2822a352 2019-10-15 stsp goto done;
7256 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7257 2822a352 2019-10-15 stsp worktree->path_prefix);
7259 2822a352 2019-10-15 stsp goto done;
7261 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7263 2822a352 2019-10-15 stsp goto done;
7265 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7266 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7268 2822a352 2019-10-15 stsp goto sync;
7270 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7272 2822a352 2019-10-15 stsp goto sync;
7274 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7276 6e210706 2021-01-22 stsp goto sync;
7278 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7280 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7281 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7282 2822a352 2019-10-15 stsp err = sync_err;
7285 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(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(branch_ref);
7290 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7291 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7292 2822a352 2019-10-15 stsp err = unlockerr;
7293 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7295 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7296 2822a352 2019-10-15 stsp free(fileindex_path);
7297 2822a352 2019-10-15 stsp free(tree_id);
7299 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7300 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7301 2822a352 2019-10-15 stsp err = unlockerr;
7302 2822a352 2019-10-15 stsp return err;
7305 2822a352 2019-10-15 stsp const struct got_error *
7306 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7307 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7308 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7310 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7312 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7314 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7316 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(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(branch_ref);
7321 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7322 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7323 8b692cd0 2019-10-21 stsp err = unlockerr;
7324 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7326 f259c4c1 2021-09-24 stsp return err;
7329 f259c4c1 2021-09-24 stsp const struct got_error *
7330 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7331 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7333 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7334 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7336 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7338 f259c4c1 2021-09-24 stsp goto done;
7340 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7342 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7343 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7344 f259c4c1 2021-09-24 stsp err = sync_err;
7346 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7347 f259c4c1 2021-09-24 stsp free(fileindex_path);
7348 8b692cd0 2019-10-21 stsp return err;
7351 f259c4c1 2021-09-24 stsp static const struct got_error *
7352 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7354 f259c4c1 2021-09-24 stsp const struct got_error *err;
7355 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7357 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7359 f259c4c1 2021-09-24 stsp goto done;
7360 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7362 f259c4c1 2021-09-24 stsp goto done;
7364 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7366 f259c4c1 2021-09-24 stsp goto done;
7367 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7369 f259c4c1 2021-09-24 stsp goto done;
7372 f259c4c1 2021-09-24 stsp free(branch_refname);
7373 f259c4c1 2021-09-24 stsp free(commit_refname);
7374 f259c4c1 2021-09-24 stsp return err;
7377 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7378 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7379 f259c4c1 2021-09-24 stsp const char *branch_name;
7382 f259c4c1 2021-09-24 stsp static const struct got_error *
7383 f259c4c1 2021-09-24 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7384 f259c4c1 2021-09-24 stsp void *arg)
7386 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7388 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7389 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7390 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7392 f259c4c1 2021-09-24 stsp return NULL;
7396 f259c4c1 2021-09-24 stsp const struct got_error *
7397 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7398 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7399 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7400 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7401 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7402 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7404 f259c4c1 2021-09-24 stsp const struct got_error *err;
7405 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7407 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7409 f259c4c1 2021-09-24 stsp goto done;
7411 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7412 f259c4c1 2021-09-24 stsp worktree);
7414 f259c4c1 2021-09-24 stsp goto done;
7416 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7417 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7418 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7420 f259c4c1 2021-09-24 stsp free(fileindex_path);
7421 f259c4c1 2021-09-24 stsp return err;
7424 f259c4c1 2021-09-24 stsp const struct got_error *
7425 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7426 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7427 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7428 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7429 0ff8d236 2021-09-28 stsp struct got_repository *repo,
7430 0ff8d236 2021-09-28 stsp got_worktree_status_cb status_cb, void *status_arg)
7433 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7434 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7435 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7436 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7437 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7438 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7439 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7440 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7441 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7443 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7445 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7447 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7449 f259c4c1 2021-09-24 stsp goto done;
7451 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7453 f259c4c1 2021-09-24 stsp goto done;
7455 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7457 f259c4c1 2021-09-24 stsp goto done;
7459 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7460 f259c4c1 2021-09-24 stsp &have_staged_files);
7461 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7462 f259c4c1 2021-09-24 stsp goto done;
7463 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7464 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7465 f259c4c1 2021-09-24 stsp goto done;
7468 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7469 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7470 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7471 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7472 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7473 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7474 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7475 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7477 f259c4c1 2021-09-24 stsp goto done;
7479 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7480 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7481 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7482 f259c4c1 2021-09-24 stsp goto done;
7485 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7486 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7487 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
7489 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
7490 f259c4c1 2021-09-24 stsp ct_path++;
7491 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
7492 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7493 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7495 f259c4c1 2021-09-24 stsp goto done;
7499 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
7500 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
7501 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
7502 f259c4c1 2021-09-24 stsp head_commit_id, branch_tip, worktree, author, committer,
7503 0ff8d236 2021-09-28 stsp merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7505 f259c4c1 2021-09-24 stsp goto done;
7507 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
7508 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
7509 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7510 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7511 f259c4c1 2021-09-24 stsp err = sync_err;
7513 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7514 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7515 f259c4c1 2021-09-24 stsp free_commitable(ct);
7517 f259c4c1 2021-09-24 stsp got_pathlist_free(&commitable_paths);
7518 f259c4c1 2021-09-24 stsp free(fileindex_path);
7519 f259c4c1 2021-09-24 stsp return err;
7522 f259c4c1 2021-09-24 stsp const struct got_error *
7523 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
7524 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
7526 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7527 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7529 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7531 f259c4c1 2021-09-24 stsp goto done;
7533 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7535 f259c4c1 2021-09-24 stsp goto done;
7536 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7537 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7538 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7539 f259c4c1 2021-09-24 stsp err = sync_err;
7541 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7542 f259c4c1 2021-09-24 stsp free(fileindex_path);
7543 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7544 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7545 f259c4c1 2021-09-24 stsp err = unlockerr;
7546 f259c4c1 2021-09-24 stsp return err;
7549 f259c4c1 2021-09-24 stsp const struct got_error *
7550 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7551 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7553 f259c4c1 2021-09-24 stsp const struct got_error *err;
7554 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
7555 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
7557 f259c4c1 2021-09-24 stsp *in_progress = 0;
7559 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7561 f259c4c1 2021-09-24 stsp return err;
7562 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7563 793fcac3 2021-09-24 stsp free(branch_refname);
7564 f259c4c1 2021-09-24 stsp if (err) {
7565 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
7566 f259c4c1 2021-09-24 stsp return err;
7568 f259c4c1 2021-09-24 stsp *in_progress = 1;
7570 f259c4c1 2021-09-24 stsp return NULL;
7573 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
7574 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7575 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
7577 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
7578 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7579 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7580 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7581 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
7582 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7583 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
7585 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7587 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7589 f259c4c1 2021-09-24 stsp return err;
7591 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7593 f259c4c1 2021-09-24 stsp goto done;
7595 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
7596 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
7597 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
7598 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7601 f259c4c1 2021-09-24 stsp goto done;
7603 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7605 f259c4c1 2021-09-24 stsp return err;
7607 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7609 f259c4c1 2021-09-24 stsp return err;
7611 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7614 f259c4c1 2021-09-24 stsp goto done;
7616 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7618 f259c4c1 2021-09-24 stsp goto done;
7620 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7621 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7622 f259c4c1 2021-09-24 stsp goto done;
7625 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
7627 f259c4c1 2021-09-24 stsp goto done;
7629 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7631 f259c4c1 2021-09-24 stsp goto done;
7632 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
7634 f259c4c1 2021-09-24 stsp goto done;
7636 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7638 f259c4c1 2021-09-24 stsp goto done;
7639 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
7641 f259c4c1 2021-09-24 stsp goto done;
7644 f259c4c1 2021-09-24 stsp free(branch_refname);
7645 f259c4c1 2021-09-24 stsp free(commit_refname);
7646 f259c4c1 2021-09-24 stsp free(fileindex_path);
7647 f259c4c1 2021-09-24 stsp if (branch_ref)
7648 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7649 f259c4c1 2021-09-24 stsp if (commit_ref)
7650 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7651 f259c4c1 2021-09-24 stsp if (wt_branch)
7652 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
7653 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
7654 f259c4c1 2021-09-24 stsp if (err) {
7655 f259c4c1 2021-09-24 stsp if (*fileindex) {
7656 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7657 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7659 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7661 f259c4c1 2021-09-24 stsp return err;
7664 f259c4c1 2021-09-24 stsp const struct got_error *
7665 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
7666 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7667 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7669 f259c4c1 2021-09-24 stsp const struct got_error *err;
7670 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
7671 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7672 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7673 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7675 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7676 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7677 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7679 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7681 f259c4c1 2021-09-24 stsp return err;
7683 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7685 f259c4c1 2021-09-24 stsp goto done;
7687 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7688 f259c4c1 2021-09-24 stsp &have_staged_files);
7689 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7690 f259c4c1 2021-09-24 stsp goto done;
7691 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7692 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7693 f259c4c1 2021-09-24 stsp goto done;
7696 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7698 f259c4c1 2021-09-24 stsp goto done;
7700 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7702 f259c4c1 2021-09-24 stsp goto done;
7704 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7706 f259c4c1 2021-09-24 stsp goto done;
7708 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
7709 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7710 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
7711 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
7712 f259c4c1 2021-09-24 stsp goto done;
7714 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7715 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
7716 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
7717 f259c4c1 2021-09-24 stsp goto done;
7720 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7722 f259c4c1 2021-09-24 stsp goto done;
7724 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
7726 f259c4c1 2021-09-24 stsp goto done;
7728 f259c4c1 2021-09-24 stsp free(commit_refname);
7729 f259c4c1 2021-09-24 stsp free(branch_refname);
7730 f259c4c1 2021-09-24 stsp free(fileindex_path);
7731 f259c4c1 2021-09-24 stsp if (commit_ref)
7732 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7733 f259c4c1 2021-09-24 stsp if (branch_ref)
7734 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7735 f259c4c1 2021-09-24 stsp if (err) {
7736 f259c4c1 2021-09-24 stsp if (*branch_name) {
7737 f259c4c1 2021-09-24 stsp free(*branch_name);
7738 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7740 f259c4c1 2021-09-24 stsp free(*branch_tip);
7741 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7742 f259c4c1 2021-09-24 stsp if (*fileindex) {
7743 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7744 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7746 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7748 f259c4c1 2021-09-24 stsp return err;
7751 f259c4c1 2021-09-24 stsp const struct got_error *
7752 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
7753 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7754 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7756 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7757 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
7758 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7759 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
7760 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
7762 f259c4c1 2021-09-24 stsp err = got_object_id_by_path(&tree_id, repo,
7763 f259c4c1 2021-09-24 stsp worktree->base_commit_id, worktree->path_prefix);
7765 f259c4c1 2021-09-24 stsp goto done;
7767 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7769 f259c4c1 2021-09-24 stsp goto done;
7771 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7773 f259c4c1 2021-09-24 stsp goto done;
7775 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
7776 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
7777 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
7778 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
7779 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
7780 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
7781 f259c4c1 2021-09-24 stsp rfa.repo = repo;
7782 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
7783 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7784 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7786 f259c4c1 2021-09-24 stsp goto sync;
7788 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7789 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7791 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7792 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7793 f259c4c1 2021-09-24 stsp err = sync_err;
7795 f259c4c1 2021-09-24 stsp free(tree_id);
7796 f259c4c1 2021-09-24 stsp free(commit_id);
7797 f259c4c1 2021-09-24 stsp if (fileindex)
7798 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7799 f259c4c1 2021-09-24 stsp free(fileindex_path);
7801 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7802 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7803 f259c4c1 2021-09-24 stsp err = unlockerr;
7804 f259c4c1 2021-09-24 stsp return err;
7807 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7808 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7809 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7810 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7811 2db2652d 2019-08-07 stsp struct got_repository *repo;
7812 2db2652d 2019-08-07 stsp int have_changes;
7815 2db2652d 2019-08-07 stsp const struct got_error *
7816 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7817 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7818 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7819 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7821 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7822 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7823 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7824 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7825 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7826 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7828 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7829 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7830 8b13ce36 2019-08-08 stsp return NULL;
7831 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7832 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7834 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7835 735ef5ac 2019-08-03 stsp if (ie == NULL)
7836 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7838 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7839 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7840 735ef5ac 2019-08-03 stsp relpath) == -1)
7841 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7843 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7844 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7845 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7846 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7849 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7850 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7851 3aa5969e 2019-08-06 stsp goto done;
7852 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7853 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7854 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7855 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7856 735ef5ac 2019-08-03 stsp goto done;
7859 2db2652d 2019-08-07 stsp a->have_changes = 1;
7861 735ef5ac 2019-08-03 stsp p = in_repo_path;
7862 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7864 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7865 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7866 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7868 735ef5ac 2019-08-03 stsp free(in_repo_path);
7869 dc424a06 2019-08-07 stsp return err;
7872 2db2652d 2019-08-07 stsp struct stage_path_arg {
7873 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7874 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7875 2db2652d 2019-08-07 stsp struct got_repository *repo;
7876 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7877 2db2652d 2019-08-07 stsp void *status_arg;
7878 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7879 2db2652d 2019-08-07 stsp void *patch_arg;
7880 7b5dc508 2019-10-28 stsp int staged_something;
7881 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7884 2db2652d 2019-08-07 stsp static const struct got_error *
7885 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7886 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7887 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7888 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7890 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7891 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7892 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7893 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7894 0cb83759 2019-08-03 stsp uint32_t stage;
7895 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7896 0aeb8099 2020-07-23 stsp struct stat sb;
7898 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7899 8b13ce36 2019-08-08 stsp return NULL;
7901 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7902 d3e7c587 2019-08-03 stsp if (ie == NULL)
7903 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7905 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7906 2db2652d 2019-08-07 stsp relpath)== -1)
7907 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7909 0cb83759 2019-08-03 stsp switch (status) {
7910 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7911 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7912 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7913 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7914 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7917 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7918 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7919 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7920 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7921 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7924 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7927 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7928 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7929 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7930 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7931 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7935 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7936 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7939 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7940 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7941 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7942 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7944 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7945 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7946 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7947 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7948 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7949 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7950 35213c7c 2020-07-23 stsp ssize_t target_len;
7951 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7952 35213c7c 2020-07-23 stsp sizeof(target_path));
7953 35213c7c 2020-07-23 stsp if (target_len == -1) {
7954 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7955 35213c7c 2020-07-23 stsp ondisk_path);
7958 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7959 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7960 35213c7c 2020-07-23 stsp a->worktree->root_path);
7963 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7964 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7965 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7969 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7970 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7971 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7973 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7974 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7976 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7977 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7979 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7980 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7982 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7983 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7984 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7986 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7987 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7989 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7990 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7991 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7992 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7995 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7997 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7998 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8002 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8003 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8004 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8005 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8007 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8008 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8011 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8013 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8014 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8016 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8017 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8020 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8024 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8025 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8026 dc424a06 2019-08-07 stsp free(path_content);
8027 2db2652d 2019-08-07 stsp free(ondisk_path);
8028 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8029 0ebf8283 2019-07-24 stsp return err;
8032 0cb83759 2019-08-03 stsp const struct got_error *
8033 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8034 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8035 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8036 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8037 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8039 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8040 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8041 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8042 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8043 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8044 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8045 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8046 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8048 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8050 0cb83759 2019-08-03 stsp return err;
8052 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8053 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8055 735ef5ac 2019-08-03 stsp goto done;
8056 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8058 735ef5ac 2019-08-03 stsp goto done;
8059 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8061 0cb83759 2019-08-03 stsp goto done;
8063 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8064 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8065 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8066 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8067 2db2652d 2019-08-07 stsp oka.repo = repo;
8068 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8069 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8070 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8071 62da3196 2021-10-01 stsp check_stage_ok, &oka, NULL, NULL, 1, 0);
8073 735ef5ac 2019-08-03 stsp goto done;
8075 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8076 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8077 2db2652d 2019-08-07 stsp goto done;
8080 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8081 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8082 2db2652d 2019-08-07 stsp spa.repo = repo;
8083 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8084 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8085 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8086 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8087 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8088 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8089 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8090 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8091 62da3196 2021-10-01 stsp stage_path, &spa, NULL, NULL, 1, 0);
8093 2db2652d 2019-08-07 stsp goto done;
8095 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8096 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8097 7b5dc508 2019-10-28 stsp goto done;
8100 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8101 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8102 0cb83759 2019-08-03 stsp err = sync_err;
8104 735ef5ac 2019-08-03 stsp if (head_ref)
8105 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8106 735ef5ac 2019-08-03 stsp free(head_commit_id);
8107 0cb83759 2019-08-03 stsp free(fileindex_path);
8108 0cb83759 2019-08-03 stsp if (fileindex)
8109 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8110 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8111 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8112 0cb83759 2019-08-03 stsp err = unlockerr;
8113 0cb83759 2019-08-03 stsp return err;
8116 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8117 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8118 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8119 ad493afc 2019-08-03 stsp struct got_repository *repo;
8120 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8121 ad493afc 2019-08-03 stsp void *progress_arg;
8122 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8123 2e1f37b0 2019-08-08 stsp void *patch_arg;
8126 2e1f37b0 2019-08-08 stsp static const struct got_error *
8127 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8128 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8129 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8130 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8131 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8133 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8134 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8135 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8136 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8137 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8138 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8139 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8141 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8142 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8144 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8146 2e1f37b0 2019-08-08 stsp return err;
8147 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8149 2e1f37b0 2019-08-08 stsp goto done;
8151 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8153 2e1f37b0 2019-08-08 stsp goto done;
8155 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8157 2e1f37b0 2019-08-08 stsp goto done;
8159 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8161 2e1f37b0 2019-08-08 stsp goto done;
8163 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8165 2e1f37b0 2019-08-08 stsp goto done;
8167 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8169 2e1f37b0 2019-08-08 stsp goto done;
8171 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8172 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8174 2e1f37b0 2019-08-08 stsp goto done;
8176 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8177 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8179 2e1f37b0 2019-08-08 stsp goto done;
8180 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8181 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8183 2e1f37b0 2019-08-08 stsp goto done;
8185 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8186 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8187 2e1f37b0 2019-08-08 stsp goto done;
8189 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8190 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8191 2e1f37b0 2019-08-08 stsp goto done;
8193 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8194 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8195 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
8196 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8197 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8198 fe621944 2020-11-10 stsp nchanges++;
8200 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8201 2e1f37b0 2019-08-08 stsp int choice;
8202 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8203 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8204 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8205 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8207 2e1f37b0 2019-08-08 stsp goto done;
8208 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8209 2e1f37b0 2019-08-08 stsp have_content = 1;
8211 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8212 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8215 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8216 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8217 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8219 2e1f37b0 2019-08-08 stsp free(label1);
8221 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8222 2e1f37b0 2019-08-08 stsp if (staged_blob)
8223 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8224 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8225 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8226 fe621944 2020-11-10 stsp err = free_err;
8227 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8228 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8229 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8230 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8231 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8232 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8233 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8234 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8235 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8236 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8237 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8238 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8239 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8240 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8241 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8242 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8243 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8244 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8245 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8247 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8248 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8249 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8250 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8251 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8252 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8253 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8255 2e1f37b0 2019-08-08 stsp free(path1);
8256 2e1f37b0 2019-08-08 stsp free(path2);
8257 fda8017d 2020-07-23 stsp return err;
8260 fda8017d 2020-07-23 stsp static const struct got_error *
8261 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8262 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8263 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8264 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8265 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8266 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8267 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8269 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8270 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8271 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8272 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8273 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8274 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8275 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8276 fda8017d 2020-07-23 stsp struct stat sb;
8278 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8279 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8280 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8282 fda8017d 2020-07-23 stsp return err;
8284 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8285 fda8017d 2020-07-23 stsp return NULL;
8287 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8288 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8289 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8291 fda8017d 2020-07-23 stsp goto done;
8294 00fe21f2 2021-12-31 stsp f = fopen(path_unstaged_content, "re");
8295 fda8017d 2020-07-23 stsp if (f == NULL) {
8296 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8297 fda8017d 2020-07-23 stsp path_unstaged_content);
8298 fda8017d 2020-07-23 stsp goto done;
8300 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8301 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8302 fda8017d 2020-07-23 stsp goto done;
8304 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8305 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8306 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8308 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8309 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8310 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8311 fda8017d 2020-07-23 stsp goto done;
8313 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8314 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8315 fda8017d 2020-07-23 stsp goto done;
8317 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8318 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8319 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8320 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8321 fda8017d 2020-07-23 stsp progress_arg);
8323 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8325 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8327 67a66647 2021-05-31 stsp return err;
8329 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8330 67a66647 2021-05-31 stsp parent) == -1) {
8331 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8332 67a66647 2021-05-31 stsp base_path = NULL;
8333 67a66647 2021-05-31 stsp goto done;
8336 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8338 67a66647 2021-05-31 stsp goto done;
8339 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8340 67a66647 2021-05-31 stsp blob_base);
8342 67a66647 2021-05-31 stsp goto done;
8345 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8346 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8348 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8349 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8350 eec2f5a9 2021-06-03 stsp ondisk_path);
8352 eec2f5a9 2021-06-03 stsp goto done;
8355 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path,
8356 8bd0cdad 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8357 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8358 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8359 eec2f5a9 2021-06-03 stsp goto done;
8361 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8362 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8363 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8364 eec2f5a9 2021-06-03 stsp close(fd);
8365 eec2f5a9 2021-06-03 stsp goto done;
8369 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8370 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8371 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8372 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8373 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8376 fda8017d 2020-07-23 stsp goto done;
8378 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8379 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8380 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8382 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8383 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8386 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8387 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8388 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8389 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8390 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8391 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8392 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8393 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8394 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8395 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8396 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8397 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8398 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8399 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8400 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8401 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8402 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8403 67a66647 2021-05-31 stsp free(blob_base_path);
8404 67a66647 2021-05-31 stsp free(parent);
8405 67a66647 2021-05-31 stsp free(base_path);
8406 2e1f37b0 2019-08-08 stsp return err;
8409 ad493afc 2019-08-03 stsp static const struct got_error *
8410 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8411 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8412 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8413 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8415 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8416 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8417 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8418 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8419 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8420 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8421 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8422 9bc94a15 2019-08-03 stsp struct stat sb;
8424 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8425 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8426 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8427 2e1f37b0 2019-08-08 stsp return NULL;
8429 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8430 ad493afc 2019-08-03 stsp if (ie == NULL)
8431 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8433 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8435 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8437 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8438 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8440 f69721c3 2019-10-21 stsp goto done;
8441 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8442 f69721c3 2019-10-21 stsp id_str) == -1) {
8443 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8444 f69721c3 2019-10-21 stsp goto done;
8447 ad493afc 2019-08-03 stsp switch (staged_status) {
8448 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8449 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8450 ad493afc 2019-08-03 stsp blob_id, 8192);
8453 ad493afc 2019-08-03 stsp /* fall through */
8454 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8455 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8456 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8457 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8458 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8459 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8462 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8465 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8466 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8467 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8468 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8469 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8470 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8473 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8474 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8477 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8478 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8479 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8480 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8481 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8482 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8483 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8484 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8485 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8487 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8488 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8489 36bf999c 2020-07-23 stsp char *staged_target;
8490 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8491 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8493 36bf999c 2020-07-23 stsp goto done;
8494 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8495 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8496 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8497 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8498 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8499 36bf999c 2020-07-23 stsp free(staged_target);
8501 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8502 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8503 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8504 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8505 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8506 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8507 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8511 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8514 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8515 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8516 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8517 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8520 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8521 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8522 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8523 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8524 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8527 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8529 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8530 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8534 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8535 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8536 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8537 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8540 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8544 ad493afc 2019-08-03 stsp free(ondisk_path);
8545 ad493afc 2019-08-03 stsp if (blob_base)
8546 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8547 ad493afc 2019-08-03 stsp if (blob_staged)
8548 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8549 f69721c3 2019-10-21 stsp free(id_str);
8550 f69721c3 2019-10-21 stsp free(label_orig);
8551 ad493afc 2019-08-03 stsp return err;
8554 ad493afc 2019-08-03 stsp const struct got_error *
8555 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8556 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8557 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8558 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8559 ad493afc 2019-08-03 stsp struct got_repository *repo)
8561 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8562 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8563 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8564 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8565 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8567 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8569 ad493afc 2019-08-03 stsp return err;
8571 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8573 ad493afc 2019-08-03 stsp goto done;
8575 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8576 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8577 ad493afc 2019-08-03 stsp upa.repo = repo;
8578 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8579 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8580 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8581 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8582 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8583 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8584 62da3196 2021-10-01 stsp unstage_path, &upa, NULL, NULL, 1, 0);
8586 ad493afc 2019-08-03 stsp goto done;
8589 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8590 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8591 ad493afc 2019-08-03 stsp err = sync_err;
8593 ad493afc 2019-08-03 stsp free(fileindex_path);
8594 ad493afc 2019-08-03 stsp if (fileindex)
8595 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8596 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8597 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8598 ad493afc 2019-08-03 stsp err = unlockerr;
8599 ad493afc 2019-08-03 stsp return err;
8602 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8603 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8604 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8605 b2118c49 2020-07-28 stsp void *info_arg;
8606 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8607 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8608 b2118c49 2020-07-28 stsp void *cancel_arg;
8611 b2118c49 2020-07-28 stsp static const struct got_error *
8612 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8614 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8615 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8616 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8617 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8618 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8619 b2118c49 2020-07-28 stsp int stage;
8621 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8622 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8624 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8625 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8626 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8629 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8630 b2118c49 2020-07-28 stsp return NULL;
8632 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8633 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8634 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8636 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8637 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8638 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8639 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8640 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8641 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8644 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8645 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8646 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8649 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8650 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8653 b2118c49 2020-07-28 stsp const struct got_error *
8654 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8655 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8656 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8657 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8660 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8661 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8662 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8663 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8665 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8667 b2118c49 2020-07-28 stsp return err;
8669 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8671 b2118c49 2020-07-28 stsp goto done;
8673 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8674 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8675 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8676 b2118c49 2020-07-28 stsp arg.paths = paths;
8677 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8678 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8679 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8682 b2118c49 2020-07-28 stsp free(fileindex_path);
8683 b2118c49 2020-07-28 stsp if (fileindex)
8684 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8685 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8686 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8687 b2118c49 2020-07-28 stsp err = unlockerr;
8688 b2118c49 2020-07-28 stsp return err;