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;
2887 72840534 2022-01-19 stsp off_t blob1_size;
2889 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2890 0a22ca1a 2020-09-23 stsp * exists in the repository.
2892 72840534 2022-01-19 stsp err = got_object_blob_file_create(&id, &blob1_f,
2893 72840534 2022-01-19 stsp &blob1_size, path1);
2895 0a22ca1a 2020-09-23 stsp goto done;
2896 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2897 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2898 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2900 0a22ca1a 2020-09-23 stsp goto done;
2901 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2904 0a22ca1a 2020-09-23 stsp goto done;
2906 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2909 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2910 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2912 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2913 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2916 0a22ca1a 2020-09-23 stsp goto done;
2919 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2920 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2921 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2922 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2924 1ee397ad 2019-07-12 stsp goto done;
2926 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2927 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2929 1ee397ad 2019-07-12 stsp goto done;
2934 234035bc 2019-06-01 stsp } else if (blob2) {
2935 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2936 234035bc 2019-06-01 stsp path2) == -1)
2937 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2938 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2939 d6c87207 2019-08-02 stsp strlen(path2));
2941 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2942 7f91a133 2019-12-13 stsp -1, NULL, repo);
2944 234035bc 2019-06-01 stsp goto done;
2945 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2946 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2947 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2948 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2949 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2950 1ee397ad 2019-07-12 stsp status, path2);
2951 234035bc 2019-06-01 stsp goto done;
2953 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2954 36bf999c 2020-07-23 stsp char *link_target2;
2955 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2958 36bf999c 2020-07-23 stsp goto done;
2959 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2960 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2961 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2962 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2963 36bf999c 2020-07-23 stsp free(link_target2);
2964 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2965 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2966 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2967 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2968 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2969 526a746f 2020-07-23 stsp a->progress_arg);
2971 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2972 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2975 dfe9fba0 2020-07-23 stsp goto done;
2976 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2977 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2978 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
2979 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2981 234035bc 2019-06-01 stsp goto done;
2984 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2985 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2986 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2987 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2988 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2989 5267b9e4 2021-09-26 stsp 0, 1, a->allow_bad_symlinks, repo,
2990 5267b9e4 2021-09-26 stsp a->progress_cb, a->progress_arg);
2992 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2993 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2994 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2997 234035bc 2019-06-01 stsp goto done;
2998 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3000 234035bc 2019-06-01 stsp goto done;
3001 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3002 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3003 3969253a 2020-03-07 stsp if (err) {
3004 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3005 3969253a 2020-03-07 stsp goto done;
3007 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3008 2b92fad7 2019-06-02 stsp if (err) {
3009 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3010 2b92fad7 2019-06-02 stsp goto done;
3012 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3013 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3014 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3019 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3020 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3021 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3022 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3023 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3024 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3025 1af628f4 2021-06-03 stsp free(id_str);
3026 54d5be07 2021-06-03 stsp free(label_deriv2);
3027 234035bc 2019-06-01 stsp free(ondisk_path);
3028 234035bc 2019-06-01 stsp return err;
3031 69de9dd4 2021-09-03 stsp static const struct got_error *
3032 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3034 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3036 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3037 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3038 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3039 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3040 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3042 69de9dd4 2021-09-03 stsp return NULL;
3045 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3046 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3047 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3048 234035bc 2019-06-01 stsp struct got_repository *repo;
3051 234035bc 2019-06-01 stsp static const struct got_error *
3052 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3053 69de9dd4 2021-09-03 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3054 69de9dd4 2021-09-03 stsp struct got_object_id *id2, const char *path1, const char *path2,
3055 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3057 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3058 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3059 234035bc 2019-06-01 stsp unsigned char status;
3060 234035bc 2019-06-01 stsp struct stat sb;
3061 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3062 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3063 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3064 234035bc 2019-06-01 stsp char *ondisk_path;
3066 69de9dd4 2021-09-03 stsp if (id == NULL)
3067 69de9dd4 2021-09-03 stsp return NULL;
3069 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3070 69de9dd4 2021-09-03 stsp if (ie == NULL)
3071 69de9dd4 2021-09-03 stsp return NULL;
3073 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3075 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3077 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3078 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3079 5546d466 2021-09-02 stsp free(ondisk_path);
3081 234035bc 2019-06-01 stsp return err;
3082 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3083 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3085 234035bc 2019-06-01 stsp return NULL;
3088 818c7501 2019-07-11 stsp static const struct got_error *
3089 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3090 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3091 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3092 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3093 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3095 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3096 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3097 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3098 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3099 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3100 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3102 03415a1a 2019-06-02 stsp if (commit_id1) {
3103 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3104 03415a1a 2019-06-02 stsp worktree->path_prefix);
3105 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3106 03415a1a 2019-06-02 stsp goto done;
3108 69d57f3d 2020-07-31 stsp if (tree_id1) {
3109 69d57f3d 2020-07-31 stsp char *id_str;
3111 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3113 03415a1a 2019-06-02 stsp goto done;
3115 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3117 f69721c3 2019-10-21 stsp goto done;
3119 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3120 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3121 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3122 f69721c3 2019-10-21 stsp free(id_str);
3123 f69721c3 2019-10-21 stsp goto done;
3125 f69721c3 2019-10-21 stsp free(id_str);
3128 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3129 234035bc 2019-06-01 stsp worktree->path_prefix);
3131 234035bc 2019-06-01 stsp goto done;
3133 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3135 234035bc 2019-06-01 stsp goto done;
3137 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3138 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3139 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3140 69de9dd4 2021-09-03 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3141 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3143 69de9dd4 2021-09-03 stsp goto done;
3145 234035bc 2019-06-01 stsp arg.worktree = worktree;
3146 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3147 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3148 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3149 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3150 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3151 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3152 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3153 5267b9e4 2021-09-26 stsp arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3154 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3155 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3156 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3157 af12c6b9 2019-06-04 stsp err = sync_err;
3159 234035bc 2019-06-01 stsp if (tree1)
3160 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3161 234035bc 2019-06-01 stsp if (tree2)
3162 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3163 f69721c3 2019-10-21 stsp free(label_orig);
3164 818c7501 2019-07-11 stsp return err;
3167 818c7501 2019-07-11 stsp const struct got_error *
3168 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3169 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3170 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3171 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3173 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3174 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3175 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3177 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3179 818c7501 2019-07-11 stsp return err;
3181 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3183 818c7501 2019-07-11 stsp goto done;
3185 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3186 69de9dd4 2021-09-03 stsp worktree);
3188 818c7501 2019-07-11 stsp goto done;
3190 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3191 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3192 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3194 818c7501 2019-07-11 stsp if (fileindex)
3195 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3196 818c7501 2019-07-11 stsp free(fileindex_path);
3197 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3198 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3199 234035bc 2019-06-01 stsp err = unlockerr;
3200 234035bc 2019-06-01 stsp return err;
3203 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3204 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3205 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3206 927df6b7 2019-02-10 stsp const char *status_path;
3207 927df6b7 2019-02-10 stsp size_t status_path_len;
3208 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3209 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3210 f8d1f275 2019-02-04 stsp void *status_arg;
3211 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3212 f8d1f275 2019-02-04 stsp void *cancel_arg;
3213 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3214 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3215 f2a9dc41 2019-12-13 tracey int report_unchanged;
3216 3143d852 2020-06-25 stsp int no_ignores;
3219 f8d1f275 2019-02-04 stsp static const struct got_error *
3220 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3221 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3222 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3223 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3225 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3226 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3227 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3228 927df6b7 2019-02-10 stsp struct stat sb;
3229 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3230 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3231 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3233 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3235 98eaaa12 2019-08-03 stsp return err;
3237 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3238 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3239 98eaaa12 2019-08-03 stsp return NULL;
3241 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3242 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3243 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3245 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3246 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3247 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3249 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3250 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3251 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3252 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3253 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3256 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3257 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3260 927df6b7 2019-02-10 stsp static const struct got_error *
3261 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3262 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3264 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3265 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3266 f8d1f275 2019-02-04 stsp char *abspath;
3268 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3269 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3271 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3272 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3273 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3274 927df6b7 2019-02-10 stsp return NULL;
3276 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3277 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3278 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3279 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3281 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3282 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3283 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3286 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3287 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3288 f8d1f275 2019-02-04 stsp free(abspath);
3289 9d31a1d8 2018-03-11 stsp return err;
3292 f8d1f275 2019-02-04 stsp static const struct got_error *
3293 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3295 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3296 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3297 2ec1f75b 2019-03-26 stsp unsigned char status;
3299 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3300 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3302 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3303 927df6b7 2019-02-10 stsp return NULL;
3305 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3306 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3307 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3308 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3310 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3311 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3312 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3316 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3318 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3320 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3321 6841da00 2019-08-08 stsp free((char *)pe->path);
3322 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3326 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3328 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3330 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3331 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3332 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3333 6841da00 2019-08-08 stsp free((char *)pe->path);
3335 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3338 6841da00 2019-08-08 stsp static const struct got_error *
3339 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3341 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3342 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3343 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3344 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3345 6841da00 2019-08-08 stsp size_t linesize = 0;
3346 6841da00 2019-08-08 stsp ssize_t linelen;
3348 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3349 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3350 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3351 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3353 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3354 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3355 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3357 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3358 bd8de430 2019-10-04 stsp if (line[0] == '#')
3361 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3362 bd8de430 2019-10-04 stsp if (line[0] == '!')
3365 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3366 6841da00 2019-08-08 stsp line) == -1) {
3367 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3368 6841da00 2019-08-08 stsp goto done;
3370 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3372 6841da00 2019-08-08 stsp goto done;
3374 6841da00 2019-08-08 stsp if (ferror(f)) {
3375 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3376 6841da00 2019-08-08 stsp goto done;
3379 6841da00 2019-08-08 stsp dirpath = strdup(path);
3380 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3381 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3382 6841da00 2019-08-08 stsp goto done;
3384 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3386 6841da00 2019-08-08 stsp free(line);
3387 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3388 6841da00 2019-08-08 stsp free(dirpath);
3389 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3391 6841da00 2019-08-08 stsp return err;
3395 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3397 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3399 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3400 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3401 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3402 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3404 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3405 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3407 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3409 bd8de430 2019-10-04 stsp pattern += 3;
3411 bd8de430 2019-10-04 stsp while (*p) {
3412 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3413 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3414 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3415 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3417 bd8de430 2019-10-04 stsp while (*p == '/')
3427 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3428 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3429 6841da00 2019-08-08 stsp * ignores backwards.
3431 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3432 6841da00 2019-08-08 stsp while (pe) {
3433 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3434 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3435 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3436 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3437 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3438 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3439 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3440 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3441 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3446 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3452 6841da00 2019-08-08 stsp static const struct got_error *
3453 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3454 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3456 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3457 6841da00 2019-08-08 stsp char *ignorespath;
3458 886cec17 2019-12-15 stsp int fd = -1;
3459 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3461 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3462 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3463 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3465 886cec17 2019-12-15 stsp if (dirfd != -1) {
3466 e7ae0baf 2021-12-31 stsp fd = openat(dirfd, ignores_filename,
3467 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3468 886cec17 2019-12-15 stsp if (fd == -1) {
3469 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3470 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3471 886cec17 2019-12-15 stsp ignorespath);
3473 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3474 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3475 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3476 886cec17 2019-12-15 stsp ignorespath);
3479 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3483 00fe21f2 2021-12-31 stsp ignoresfile = fopen(ignorespath, "re");
3484 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3485 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3486 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3487 886cec17 2019-12-15 stsp ignorespath);
3489 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3492 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3493 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3494 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3495 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3496 6841da00 2019-08-08 stsp free(ignorespath);
3497 6841da00 2019-08-08 stsp return err;
3500 f8d1f275 2019-02-04 stsp static const struct got_error *
3501 62da3196 2021-10-01 stsp status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3502 62da3196 2021-10-01 stsp int dirfd)
3504 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3505 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3506 f8d1f275 2019-02-04 stsp char *path = NULL;
3508 62da3196 2021-10-01 stsp if (ignore != NULL)
3509 62da3196 2021-10-01 stsp *ignore = 0;
3511 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3512 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3514 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3515 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3516 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3518 f8d1f275 2019-02-04 stsp path = de->d_name;
3521 62da3196 2021-10-01 stsp if (de->d_type == DT_DIR) {
3522 62da3196 2021-10-01 stsp if (!a->no_ignores && ignore != NULL &&
3523 62da3196 2021-10-01 stsp match_ignores(a->ignores, path))
3524 62da3196 2021-10-01 stsp *ignore = 1;
3525 62da3196 2021-10-01 stsp } else if (!match_ignores(a->ignores, path) &&
3526 62da3196 2021-10-01 stsp got_path_is_child(path, a->status_path, a->status_path_len))
3527 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3528 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3529 f8d1f275 2019-02-04 stsp if (parent_path[0])
3530 f8d1f275 2019-02-04 stsp free(path);
3531 b72f483a 2019-02-05 stsp return err;
3534 347d1d3e 2019-07-12 stsp static const struct got_error *
3535 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3537 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3538 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3540 3143d852 2020-06-25 stsp if (a->no_ignores)
3541 3143d852 2020-06-25 stsp return NULL;
3543 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3544 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3546 3143d852 2020-06-25 stsp return err;
3548 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3549 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3551 3143d852 2020-06-25 stsp return err;
3554 3143d852 2020-06-25 stsp static const struct got_error *
3555 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3556 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3557 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3558 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3560 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3561 abb4604f 2019-07-27 stsp struct stat sb;
3563 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3565 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3566 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3568 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3569 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3570 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3571 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3572 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3575 916237f3 2022-02-11 stsp if (!no_ignores && match_ignores(ignores, path))
3576 916237f3 2022-02-11 stsp return NULL;
3578 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3579 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3580 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3582 abb4604f 2019-07-27 stsp return NULL;
3585 3143d852 2020-06-25 stsp static const struct got_error *
3586 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3587 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3589 3143d852 2020-06-25 stsp const struct got_error *err;
3590 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3592 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3593 3143d852 2020-06-25 stsp ".cvsignore");
3595 3143d852 2020-06-25 stsp return err;
3597 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3598 3143d852 2020-06-25 stsp ".gitignore");
3600 3143d852 2020-06-25 stsp return err;
3602 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3603 3143d852 2020-06-25 stsp if (err) {
3604 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3605 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3606 3143d852 2020-06-25 stsp return err;
3608 3143d852 2020-06-25 stsp for (;;) {
3609 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3610 3143d852 2020-06-25 stsp ".cvsignore");
3613 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3614 3143d852 2020-06-25 stsp ".gitignore");
3617 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3618 3143d852 2020-06-25 stsp if (err) {
3619 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3620 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3623 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3625 b737c85a 2020-06-26 stsp free(parent_path);
3626 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3627 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3630 b737c85a 2020-06-26 stsp free(parent_path);
3631 b737c85a 2020-06-26 stsp free(next_parent_path);
3632 3143d852 2020-06-25 stsp return err;
3635 abb4604f 2019-07-27 stsp static const struct got_error *
3636 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3637 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3638 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3639 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3640 f2a9dc41 2019-12-13 tracey int report_unchanged)
3642 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3643 6fc93f37 2019-12-13 stsp int fd = -1;
3644 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3645 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3646 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3647 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3648 a84c0d30 2022-03-12 stsp struct got_fileindex_entry *ie;
3650 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3652 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3653 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3654 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3656 a84c0d30 2022-03-12 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3658 a84c0d30 2022-03-12 stsp err = report_single_file_status(path, ondisk_path,
3659 a84c0d30 2022-03-12 stsp fileindex, status_cb, status_arg, repo,
3660 a84c0d30 2022-03-12 stsp report_unchanged, &ignores, no_ignores);
3661 a84c0d30 2022-03-12 stsp goto done;
3664 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3665 6fc93f37 2019-12-13 stsp if (fd == -1) {
3666 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3667 5c02d2a5 2021-09-26 stsp !got_err_open_nofollow_on_symlink())
3668 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3670 ff56836b 2021-07-08 stsp if (!no_ignores) {
3671 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3672 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3674 ff56836b 2021-07-08 stsp goto done;
3676 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3677 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3678 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3681 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3682 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3683 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3684 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3685 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3686 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3687 abb4604f 2019-07-27 stsp arg.status_path = path;
3688 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3689 abb4604f 2019-07-27 stsp arg.repo = repo;
3690 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3691 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3692 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3693 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3694 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3695 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3696 022fae89 2019-12-06 tracey if (!no_ignores) {
3697 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3698 3143d852 2020-06-25 stsp worktree->root_path, path);
3700 3143d852 2020-06-25 stsp goto done;
3702 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3703 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3704 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3707 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3708 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3709 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3710 927df6b7 2019-02-10 stsp free(ondisk_path);
3711 347d1d3e 2019-07-12 stsp return err;
3714 347d1d3e 2019-07-12 stsp const struct got_error *
3715 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3716 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3717 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3718 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3720 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3721 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3722 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3723 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3725 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3727 347d1d3e 2019-07-12 stsp return err;
3729 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3730 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3731 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3732 f6343036 2021-06-22 stsp no_ignores, 0);
3736 f8d1f275 2019-02-04 stsp free(fileindex_path);
3737 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3738 f8d1f275 2019-02-04 stsp return err;
3741 6c7ab921 2019-03-18 stsp const struct got_error *
3742 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3743 6c7ab921 2019-03-18 stsp const char *arg)
3745 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3746 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3747 6c7ab921 2019-03-18 stsp size_t len;
3748 00bb5ea0 2020-07-23 stsp struct stat sb;
3749 01740607 2020-11-04 stsp char *abspath = NULL;
3750 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3752 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3754 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3755 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3756 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3758 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3759 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3760 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3761 00bb5ea0 2020-07-23 stsp goto done;
3763 727173c3 2020-11-06 stsp sb.st_mode = 0;
3765 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3767 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3768 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3769 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3770 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3772 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3773 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3774 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3775 00bb5ea0 2020-07-23 stsp goto done;
3779 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3780 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3782 d0710d08 2019-07-22 stsp goto done;
3783 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3784 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3785 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3786 00bb5ea0 2020-07-23 stsp goto done;
3789 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3790 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3791 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3792 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3793 00bb5ea0 2020-07-23 stsp goto done;
3795 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3796 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3797 01740607 2020-11-04 stsp goto done;
3799 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3800 01740607 2020-11-04 stsp sizeof(canonpath));
3802 00bb5ea0 2020-07-23 stsp goto done;
3803 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3804 01740607 2020-11-04 stsp if (resolved == NULL) {
3805 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3806 01740607 2020-11-04 stsp goto done;
3811 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3812 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3813 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3814 6c7ab921 2019-03-18 stsp goto done;
3817 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3818 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3819 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3821 f6d88e1a 2019-05-29 stsp goto done;
3823 f6d88e1a 2019-05-29 stsp path = strdup("");
3824 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3825 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3826 f6d88e1a 2019-05-29 stsp goto done;
3830 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3831 6c7ab921 2019-03-18 stsp len = strlen(path);
3832 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3833 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3837 01740607 2020-11-04 stsp free(abspath);
3838 6c7ab921 2019-03-18 stsp free(resolved);
3839 d0710d08 2019-07-22 stsp free(cwd);
3840 6c7ab921 2019-03-18 stsp if (err == NULL)
3841 6c7ab921 2019-03-18 stsp *wt_path = path;
3843 6c7ab921 2019-03-18 stsp free(path);
3844 d00136be 2019-03-26 stsp return err;
3847 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3848 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3849 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3850 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3851 4e68cba3 2019-11-23 stsp void *progress_arg;
3852 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3855 4e68cba3 2019-11-23 stsp static const struct got_error *
3856 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3857 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3858 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3859 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3861 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3862 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3863 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3864 6d022e97 2019-08-04 stsp struct stat sb;
3865 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3867 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3868 dbb83fbd 2019-12-12 stsp relpath) == -1)
3869 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3871 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3873 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3874 12463d8b 2019-12-13 stsp de_name, a->repo);
3876 dbb83fbd 2019-12-12 stsp goto done;
3877 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3878 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3879 dbb83fbd 2019-12-12 stsp goto done;
3880 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3882 dbb83fbd 2019-12-12 stsp goto done;
3885 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3886 9b4603c0 2022-01-31 stsp if (status == GOT_STATUS_NONEXISTENT)
3887 9b4603c0 2022-01-31 stsp err = got_error_set_errno(ENOENT, ondisk_path);
3889 9b4603c0 2022-01-31 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3890 dbb83fbd 2019-12-12 stsp goto done;
3893 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3895 4e68cba3 2019-11-23 stsp goto done;
3896 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3897 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3898 3969253a 2020-03-07 stsp if (err) {
3899 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3900 3969253a 2020-03-07 stsp goto done;
3902 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3903 07f5b47a 2019-06-02 stsp if (err) {
3904 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3905 4e68cba3 2019-11-23 stsp goto done;
3908 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3910 dbb83fbd 2019-12-12 stsp return err;
3911 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3912 dbb83fbd 2019-12-12 stsp return NULL;
3913 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3916 d00136be 2019-03-26 stsp const struct got_error *
3917 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3918 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3919 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3920 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3922 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3923 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3924 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3925 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3926 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3928 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3930 d00136be 2019-03-26 stsp return err;
3932 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3934 d00136be 2019-03-26 stsp goto done;
3936 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3937 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3938 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3939 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3940 4e68cba3 2019-11-23 stsp saa.repo = repo;
3942 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3943 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3944 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3948 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3949 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3950 af12c6b9 2019-06-04 stsp err = sync_err;
3952 fb399478 2019-07-12 stsp free(fileindex_path);
3953 d00136be 2019-03-26 stsp if (fileindex)
3954 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3955 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3956 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3957 d00136be 2019-03-26 stsp err = unlockerr;
3958 6c7ab921 2019-03-18 stsp return err;
3961 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3962 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3963 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3964 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3965 f2a9dc41 2019-12-13 tracey void *progress_arg;
3966 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3967 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3968 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3969 4e12cd97 2022-01-25 stsp int ignore_missing_paths;
3970 766841c2 2020-08-13 stsp const char *status_codes;
3973 f2a9dc41 2019-12-13 tracey static const struct got_error *
3974 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3975 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3976 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3977 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3979 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3980 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3981 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3982 17ed4618 2019-06-02 stsp struct stat sb;
3983 20a2ad1c 2020-10-20 stsp char *ondisk_path;
3985 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_NONEXISTENT) {
3986 4e12cd97 2022-01-25 stsp if (a->ignore_missing_paths)
3987 4e12cd97 2022-01-25 stsp return NULL;
3988 4e12cd97 2022-01-25 stsp return got_error_set_errno(ENOENT, relpath);
3991 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3992 17ed4618 2019-06-02 stsp if (ie == NULL)
3993 692bdcc4 2022-01-25 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
3995 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3996 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3997 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3998 9acbc4fa 2019-08-03 stsp return NULL;
3999 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4002 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4003 f2a9dc41 2019-12-13 tracey relpath) == -1)
4004 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4006 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4009 f2a9dc41 2019-12-13 tracey goto done;
4011 766841c2 2020-08-13 stsp if (a->status_codes) {
4012 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4014 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4015 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4018 766841c2 2020-08-13 stsp if (i == ncodes) {
4019 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4020 766841c2 2020-08-13 stsp free(ondisk_path);
4021 766841c2 2020-08-13 stsp return NULL;
4023 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4024 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4025 766841c2 2020-08-13 stsp static char msg[64];
4026 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4027 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4028 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4029 766841c2 2020-08-13 stsp goto done;
4033 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4034 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4035 f2a9dc41 2019-12-13 tracey goto done;
4036 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4037 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4038 f2a9dc41 2019-12-13 tracey goto done;
4040 4e12cd97 2022-01-25 stsp if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4041 4e12cd97 2022-01-25 stsp err = got_error_set_errno(ENOENT, relpath);
4042 4e12cd97 2022-01-25 stsp goto done;
4044 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4045 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4046 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4047 f2a9dc41 2019-12-13 tracey goto done;
4051 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4052 20a2ad1c 2020-10-20 stsp size_t root_len;
4054 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4055 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4056 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4057 12463d8b 2019-12-13 stsp ondisk_path);
4058 12463d8b 2019-12-13 stsp goto done;
4060 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4061 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4062 12463d8b 2019-12-13 stsp goto done;
4065 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4067 20a2ad1c 2020-10-20 stsp char *parent;
4068 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4070 2513f20a 2020-10-20 stsp goto done;
4071 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4072 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4073 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4074 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4075 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4076 20a2ad1c 2020-10-20 stsp ondisk_path);
4079 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4080 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4083 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4085 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4086 f2a9dc41 2019-12-13 tracey if (err)
4087 f2a9dc41 2019-12-13 tracey return err;
4088 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4089 f2a9dc41 2019-12-13 tracey return NULL;
4090 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4091 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4094 2ec1f75b 2019-03-26 stsp const struct got_error *
4095 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4096 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4097 766841c2 2020-08-13 stsp const char *status_codes,
4098 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4099 4e12cd97 2022-01-25 stsp struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4101 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4102 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4103 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4104 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4105 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4107 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4109 2ec1f75b 2019-03-26 stsp return err;
4111 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4113 2ec1f75b 2019-03-26 stsp goto done;
4115 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4116 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4117 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4118 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4119 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4120 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4121 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4122 4e12cd97 2022-01-25 stsp sda.ignore_missing_paths = ignore_missing_paths;
4123 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4125 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4126 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4127 62da3196 2021-10-01 stsp schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4131 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4132 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4133 af12c6b9 2019-06-04 stsp err = sync_err;
4135 fb399478 2019-07-12 stsp free(fileindex_path);
4136 2ec1f75b 2019-03-26 stsp if (fileindex)
4137 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4138 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4139 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4140 2ec1f75b 2019-03-26 stsp err = unlockerr;
4141 33aa809d 2019-08-08 stsp return err;
4144 33aa809d 2019-08-08 stsp static const struct got_error *
4145 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4147 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4148 33aa809d 2019-08-08 stsp char *line = NULL;
4149 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4150 33aa809d 2019-08-08 stsp ssize_t linelen;
4152 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4153 33aa809d 2019-08-08 stsp if (linelen == -1) {
4154 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4155 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4156 33aa809d 2019-08-08 stsp goto done;
4158 33aa809d 2019-08-08 stsp return NULL;
4160 33aa809d 2019-08-08 stsp if (outfile) {
4161 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4162 33aa809d 2019-08-08 stsp if (n != linelen) {
4163 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4164 33aa809d 2019-08-08 stsp goto done;
4167 33aa809d 2019-08-08 stsp if (rejectfile) {
4168 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4169 33aa809d 2019-08-08 stsp if (n != linelen)
4170 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4173 33aa809d 2019-08-08 stsp free(line);
4174 2ec1f75b 2019-03-26 stsp return err;
4177 33aa809d 2019-08-08 stsp static const struct got_error *
4178 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4180 33aa809d 2019-08-08 stsp char *line = NULL;
4181 33aa809d 2019-08-08 stsp size_t linesize = 0;
4182 33aa809d 2019-08-08 stsp ssize_t linelen;
4184 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4185 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4186 500467ff 2019-09-25 hiltjo if (ferror(f))
4187 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4188 500467ff 2019-09-25 hiltjo return NULL;
4190 33aa809d 2019-08-08 stsp free(line);
4191 33aa809d 2019-08-08 stsp return NULL;
4194 33aa809d 2019-08-08 stsp static const struct got_error *
4195 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4196 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4197 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4199 33aa809d 2019-08-08 stsp const struct got_error *err;
4201 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4202 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4203 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4205 33aa809d 2019-08-08 stsp return err;
4206 33aa809d 2019-08-08 stsp (*line_cur1)++;
4208 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4209 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4210 33aa809d 2019-08-08 stsp if (rejectfile)
4211 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4213 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4215 33aa809d 2019-08-08 stsp return err;
4216 33aa809d 2019-08-08 stsp (*line_cur2)++;
4218 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4219 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4220 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4222 33aa809d 2019-08-08 stsp return err;
4223 33aa809d 2019-08-08 stsp (*line_cur2)++;
4225 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4226 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4227 33aa809d 2019-08-08 stsp if (rejectfile)
4228 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4230 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4232 33aa809d 2019-08-08 stsp return err;
4233 33aa809d 2019-08-08 stsp (*line_cur1)++;
4236 f1e81a05 2019-08-10 stsp return NULL;
4239 f1e81a05 2019-08-10 stsp static const struct got_error *
4240 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4241 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4243 f1e81a05 2019-08-10 stsp const struct got_error *err;
4245 f1e81a05 2019-08-10 stsp if (outfile) {
4246 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4247 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4248 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4250 f1e81a05 2019-08-10 stsp return err;
4251 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4254 f1e81a05 2019-08-10 stsp if (rejectfile) {
4255 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4256 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4257 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4259 f1e81a05 2019-08-10 stsp return err;
4260 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4264 33aa809d 2019-08-08 stsp return NULL;
4267 33aa809d 2019-08-08 stsp static const struct got_error *
4268 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4269 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4270 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4271 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4272 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4274 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4275 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4276 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4277 33aa809d 2019-08-08 stsp FILE *hunkfile;
4278 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4279 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4282 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4284 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4285 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4286 fe621944 2020-11-10 stsp start_old = cc.left.start;
4287 fe621944 2020-11-10 stsp end_old = cc.left.end;
4288 fe621944 2020-11-10 stsp start_new = cc.right.start;
4289 fe621944 2020-11-10 stsp end_new = cc.right.end;
4291 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4292 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4293 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4295 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4296 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4297 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4299 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4300 fe621944 2020-11-10 stsp if (diff_state == NULL)
4301 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4302 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4304 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4305 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4306 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4307 33aa809d 2019-08-08 stsp goto done;
4310 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4311 fe621944 2020-11-10 stsp diff_result, &cc);
4312 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4313 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4314 33aa809d 2019-08-08 stsp goto done;
4317 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4318 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4319 33aa809d 2019-08-08 stsp goto done;
4322 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4323 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4325 33aa809d 2019-08-08 stsp goto done;
4327 33aa809d 2019-08-08 stsp switch (*choice) {
4328 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4329 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4330 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4332 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4333 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4334 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4336 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4339 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4343 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4344 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4345 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4346 33aa809d 2019-08-08 stsp return err;
4349 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4350 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4351 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4352 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4353 1f1abb7e 2019-08-08 stsp void *progress_arg;
4354 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4355 33aa809d 2019-08-08 stsp void *patch_arg;
4356 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4357 f259c4c1 2021-09-24 stsp int unlink_added_files;
4360 e20a8b6f 2019-06-04 stsp static const struct got_error *
4361 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4362 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4363 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4364 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4365 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4367 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4368 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4369 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4370 1ebedb77 2019-10-19 stsp int fd2 = -1;
4371 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4372 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4373 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4374 fe621944 2020-11-10 stsp struct stat sb2;
4375 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4376 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4377 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4379 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4381 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4383 33aa809d 2019-08-08 stsp return err;
4385 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4386 e7ae0baf 2021-12-31 stsp fd2 = openat(dirfd2, de_name2,
4387 e7ae0baf 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4388 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4389 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4390 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4391 fa3cef63 2020-07-23 stsp goto done;
4393 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4394 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4395 c0df5966 2021-12-31 stsp if (link_len == -1) {
4396 c0df5966 2021-12-31 stsp return got_error_from_errno2("readlinkat",
4399 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4400 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4403 8bd0cdad 2021-12-31 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4404 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4405 5c02d2a5 2021-09-26 stsp if (!got_err_open_nofollow_on_symlink()) {
4406 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4407 fa3cef63 2020-07-23 stsp goto done;
4409 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4410 fa3cef63 2020-07-23 stsp sizeof(link_target));
4411 fa3cef63 2020-07-23 stsp if (link_len == -1)
4412 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4413 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4414 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4417 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4418 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4419 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4420 fa3cef63 2020-07-23 stsp goto done;
4423 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4424 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4425 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4426 fa3cef63 2020-07-23 stsp goto done;
4431 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4432 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4433 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4434 fa3cef63 2020-07-23 stsp goto done;
4436 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4437 fa3cef63 2020-07-23 stsp if (n != link_len) {
4438 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4439 fa3cef63 2020-07-23 stsp goto done;
4441 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4442 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4443 fa3cef63 2020-07-23 stsp goto done;
4445 fa3cef63 2020-07-23 stsp rewind(f2);
4448 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4450 33aa809d 2019-08-08 stsp goto done;
4452 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4454 33aa809d 2019-08-08 stsp goto done;
4456 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4458 33aa809d 2019-08-08 stsp goto done;
4460 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4463 33aa809d 2019-08-08 stsp goto done;
4465 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4467 33aa809d 2019-08-08 stsp goto done;
4469 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4470 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4471 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4472 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4474 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4475 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4476 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4477 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4478 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4479 fe621944 2020-11-10 stsp nchanges++;
4481 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4482 33aa809d 2019-08-08 stsp int choice;
4483 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4484 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4485 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4486 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4487 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4488 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4490 33aa809d 2019-08-08 stsp goto done;
4491 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4492 33aa809d 2019-08-08 stsp have_content = 1;
4493 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4496 1ebedb77 2019-10-19 stsp if (have_content) {
4497 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4498 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4499 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4501 1ebedb77 2019-10-19 stsp goto done;
4503 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4504 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4505 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4506 fa3cef63 2020-07-23 stsp goto done;
4511 33aa809d 2019-08-08 stsp free(id_str);
4513 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4514 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4515 fe621944 2020-11-10 stsp if (err == NULL)
4516 fe621944 2020-11-10 stsp err = free_err;
4517 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4518 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4519 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4520 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4521 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4522 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4523 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4524 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4525 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4526 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4527 33aa809d 2019-08-08 stsp if (err || !have_content) {
4528 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4529 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4530 33aa809d 2019-08-08 stsp free(*path_outfile);
4531 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4533 33aa809d 2019-08-08 stsp free(path1);
4534 33aa809d 2019-08-08 stsp return err;
4537 33aa809d 2019-08-08 stsp static const struct got_error *
4538 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4539 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4540 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4541 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4543 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4544 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4545 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4546 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4547 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4548 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4549 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4550 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4551 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4552 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4554 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4555 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4556 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4557 d3bcc3d1 2019-08-08 stsp return NULL;
4559 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4560 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4561 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4563 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4564 65084dad 2019-08-08 stsp if (ie == NULL)
4565 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4567 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4568 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4569 a129376b 2019-03-28 stsp if (err) {
4570 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4571 a129376b 2019-03-28 stsp goto done;
4572 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4573 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4574 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4575 e20a8b6f 2019-06-04 stsp goto done;
4578 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4579 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4580 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4581 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4582 a129376b 2019-03-28 stsp goto done;
4585 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4586 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4587 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4588 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4589 a129376b 2019-03-28 stsp goto done;
4592 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4593 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4594 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4595 a129376b 2019-03-28 stsp goto done;
4600 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4601 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4602 a9fa2909 2019-07-27 stsp if (err) {
4603 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4604 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4605 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4606 a9fa2909 2019-07-27 stsp goto done;
4608 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4610 a9fa2909 2019-07-27 stsp goto done;
4612 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4614 a9fa2909 2019-07-27 stsp goto done;
4616 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4617 1233e6b6 2020-10-19 stsp free(te_name);
4618 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4619 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4620 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4621 a9fa2909 2019-07-27 stsp goto done;
4625 a129376b 2019-03-28 stsp switch (status) {
4626 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4627 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4628 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4629 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4630 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4632 33aa809d 2019-08-08 stsp goto done;
4633 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4636 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4637 1f1abb7e 2019-08-08 stsp ie->path);
4639 1ee397ad 2019-07-12 stsp goto done;
4640 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4641 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4642 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4643 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4644 f259c4c1 2021-09-24 stsp relpath) == -1) {
4645 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4646 f259c4c1 2021-09-24 stsp goto done;
4648 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4649 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4650 f259c4c1 2021-09-24 stsp ondisk_path);
4655 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4656 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4657 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4658 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4659 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4661 33aa809d 2019-08-08 stsp goto done;
4662 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4665 33aa809d 2019-08-08 stsp /* fall through */
4666 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4667 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4668 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4669 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4670 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4671 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4672 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4673 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4674 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4676 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4677 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4678 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4680 65084dad 2019-08-08 stsp goto done;
4682 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4683 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4684 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4685 a129376b 2019-03-28 stsp goto done;
4688 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4689 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4690 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4691 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4692 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4693 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4694 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4696 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4697 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4698 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4699 369fd7e5 2020-07-23 stsp path_content);
4702 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4703 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4704 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4705 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4707 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4708 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4709 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4710 369fd7e5 2020-07-23 stsp goto done;
4714 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4715 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4716 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4717 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4718 5267b9e4 2021-09-26 stsp blob, 0, 1, 0, 0, a->repo,
4719 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4721 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4723 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4724 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4725 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4726 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4729 a129376b 2019-03-28 stsp goto done;
4730 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4731 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4732 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4733 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4734 437adc9d 2020-12-10 yzhong blob->id.sha1,
4735 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4737 2e1fa222 2020-07-23 stsp goto done;
4739 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4740 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4741 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4750 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4751 33aa809d 2019-08-08 stsp free(path_content);
4752 e20a8b6f 2019-06-04 stsp free(parent_path);
4753 a129376b 2019-03-28 stsp free(tree_path);
4755 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4757 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4758 a129376b 2019-03-28 stsp free(tree_id);
4759 e20a8b6f 2019-06-04 stsp return err;
4762 e20a8b6f 2019-06-04 stsp const struct got_error *
4763 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4764 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4765 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4766 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4767 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4769 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4770 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4771 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4772 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4773 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4774 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4776 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4778 e20a8b6f 2019-06-04 stsp return err;
4780 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4782 e20a8b6f 2019-06-04 stsp goto done;
4784 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4785 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4786 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4787 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4788 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4789 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4790 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4791 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4792 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4793 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4794 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
4798 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4799 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4800 e20a8b6f 2019-06-04 stsp err = sync_err;
4802 fb399478 2019-07-12 stsp free(fileindex_path);
4803 a129376b 2019-03-28 stsp if (fileindex)
4804 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4805 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4806 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4807 a129376b 2019-03-28 stsp err = unlockerr;
4808 c4296144 2019-05-09 stsp return err;
4811 cf066bf8 2019-05-09 stsp static void
4812 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4814 24519714 2019-05-09 stsp free(ct->path);
4815 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4816 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4817 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4818 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4819 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4820 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4824 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4825 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4826 24519714 2019-05-09 stsp struct got_repository *repo;
4827 24519714 2019-05-09 stsp struct got_worktree *worktree;
4828 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4829 5f8a88c6 2019-08-03 stsp int have_staged_files;
4830 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4833 c4296144 2019-05-09 stsp static const struct got_error *
4834 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4835 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4836 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4837 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4839 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4840 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4841 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4842 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4843 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4844 768aea60 2019-05-09 stsp struct stat sb;
4846 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4847 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4848 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4849 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4850 5f8a88c6 2019-08-03 stsp return NULL;
4852 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4853 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4855 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4856 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4857 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4858 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4859 5f8a88c6 2019-08-03 stsp return NULL;
4862 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4863 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4864 036813ee 2019-05-09 stsp goto done;
4866 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4867 036813ee 2019-05-09 stsp parent_path = strdup("");
4868 69960a46 2019-05-09 stsp if (parent_path == NULL)
4869 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4871 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4873 69960a46 2019-05-09 stsp return err;
4876 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4877 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4878 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4879 c4296144 2019-05-09 stsp goto done;
4882 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4883 768aea60 2019-05-09 stsp relpath) == -1) {
4884 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4885 768aea60 2019-05-09 stsp goto done;
4888 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4889 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4890 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4891 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4892 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4893 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4894 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4895 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4897 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4898 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4901 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4902 0aeb8099 2020-07-23 stsp goto done;
4904 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4905 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4906 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4907 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4908 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4909 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4910 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4911 12463d8b 2019-12-13 stsp ct->ondisk_path);
4912 12463d8b 2019-12-13 stsp goto done;
4914 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4915 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4916 768aea60 2019-05-09 stsp goto done;
4918 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4921 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4922 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4923 44d03001 2019-05-09 stsp relpath) == -1) {
4924 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4925 44d03001 2019-05-09 stsp goto done;
4928 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4929 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4930 35213c7c 2020-07-23 stsp int is_bad_symlink;
4931 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4932 35213c7c 2020-07-23 stsp ssize_t target_len;
4933 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4934 35213c7c 2020-07-23 stsp sizeof(target_path));
4935 35213c7c 2020-07-23 stsp if (target_len == -1) {
4936 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4937 35213c7c 2020-07-23 stsp ct->ondisk_path);
4938 35213c7c 2020-07-23 stsp goto done;
4940 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4941 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4943 35213c7c 2020-07-23 stsp goto done;
4944 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4945 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4946 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4947 35213c7c 2020-07-23 stsp goto done;
4952 cf066bf8 2019-05-09 stsp ct->status = status;
4953 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4954 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4955 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4956 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4957 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4958 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4959 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4960 b416585c 2019-05-13 stsp goto done;
4962 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4963 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4964 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4965 f0b75401 2019-08-03 stsp goto done;
4968 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4969 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4970 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4971 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4972 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4973 036813ee 2019-05-09 stsp goto done;
4976 24519714 2019-05-09 stsp ct->path = strdup(path);
4977 24519714 2019-05-09 stsp if (ct->path == NULL) {
4978 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4979 24519714 2019-05-09 stsp goto done;
4981 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4983 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4984 ed175427 2019-05-09 stsp free_commitable(ct);
4985 24519714 2019-05-09 stsp free(parent_path);
4986 036813ee 2019-05-09 stsp free(path);
4987 a129376b 2019-03-28 stsp return err;
4990 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4991 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4992 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4993 036813ee 2019-05-09 stsp struct got_repository *);
4995 ed175427 2019-05-09 stsp static const struct got_error *
4996 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4997 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4998 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4999 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5000 afa376bf 2019-05-09 stsp struct got_repository *repo)
5002 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5003 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5004 036813ee 2019-05-09 stsp char *subpath;
5006 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5007 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5008 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5010 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5012 ed175427 2019-05-09 stsp return err;
5014 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5015 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5016 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5017 036813ee 2019-05-09 stsp free(subpath);
5018 036813ee 2019-05-09 stsp return err;
5021 036813ee 2019-05-09 stsp static const struct got_error *
5022 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5024 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5025 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5027 036813ee 2019-05-09 stsp *match = 0;
5029 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5030 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5031 0f63689d 2019-05-10 stsp return NULL;
5034 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5036 0f63689d 2019-05-10 stsp return err;
5037 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5038 036813ee 2019-05-09 stsp free(ct_parent_path);
5039 036813ee 2019-05-09 stsp return err;
5042 768aea60 2019-05-09 stsp static mode_t
5043 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5045 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5046 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5048 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5051 036813ee 2019-05-09 stsp static const struct got_error *
5052 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5053 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5055 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5057 036813ee 2019-05-09 stsp *new_te = NULL;
5059 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5061 036813ee 2019-05-09 stsp goto done;
5063 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5065 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5066 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5067 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5069 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5071 036813ee 2019-05-09 stsp if (err && *new_te) {
5072 56e0773d 2019-11-28 stsp free(*new_te);
5073 036813ee 2019-05-09 stsp *new_te = NULL;
5075 036813ee 2019-05-09 stsp return err;
5078 036813ee 2019-05-09 stsp static const struct got_error *
5079 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5080 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5082 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5083 102b254e 2020-10-19 stsp char *ct_name = NULL;
5085 036813ee 2019-05-09 stsp *new_te = NULL;
5087 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5088 036813ee 2019-05-09 stsp if (*new_te == NULL)
5089 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5091 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5093 036813ee 2019-05-09 stsp goto done;
5094 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5095 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5096 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5097 036813ee 2019-05-09 stsp goto done;
5100 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5102 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5103 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5104 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5106 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5108 102b254e 2020-10-19 stsp free(ct_name);
5109 036813ee 2019-05-09 stsp if (err && *new_te) {
5110 56e0773d 2019-11-28 stsp free(*new_te);
5111 036813ee 2019-05-09 stsp *new_te = NULL;
5113 036813ee 2019-05-09 stsp return err;
5116 036813ee 2019-05-09 stsp static const struct got_error *
5117 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5118 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5120 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5121 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5123 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5125 036813ee 2019-05-09 stsp return err;
5126 036813ee 2019-05-09 stsp if (new_pe == NULL)
5127 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5128 036813ee 2019-05-09 stsp return NULL;
5131 afa376bf 2019-05-09 stsp static const struct got_error *
5132 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5133 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5135 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5136 5f8a88c6 2019-08-03 stsp unsigned char status;
5138 0ff8d236 2021-09-28 stsp if (status_cb == NULL) /* no commit progress output desired */
5139 0ff8d236 2021-09-28 stsp return NULL;
5141 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5142 afa376bf 2019-05-09 stsp ct_path++;
5144 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5145 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5147 5f8a88c6 2019-08-03 stsp status = ct->status;
5149 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5150 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5153 036813ee 2019-05-09 stsp static const struct got_error *
5154 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5155 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5157 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5158 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5159 44d03001 2019-05-09 stsp char *te_path;
5161 44d03001 2019-05-09 stsp *modified = 0;
5163 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5164 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5165 44d03001 2019-05-09 stsp te->name) == -1)
5166 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5168 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5169 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5170 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5171 44d03001 2019-05-09 stsp strlen(te_path));
5172 62d463ca 2020-10-20 naddy if (*modified)
5176 44d03001 2019-05-09 stsp free(te_path);
5177 44d03001 2019-05-09 stsp return err;
5180 44d03001 2019-05-09 stsp static const struct got_error *
5181 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5182 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5183 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5185 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5186 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5188 036813ee 2019-05-09 stsp *ctp = NULL;
5190 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5191 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5192 036813ee 2019-05-09 stsp char *ct_name = NULL;
5193 036813ee 2019-05-09 stsp int path_matches;
5195 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5196 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5197 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5198 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5201 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5202 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5206 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5209 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5211 036813ee 2019-05-09 stsp return err;
5212 036813ee 2019-05-09 stsp if (!path_matches)
5215 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5217 d34b633e 2020-10-19 stsp return err;
5219 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5220 d34b633e 2020-10-19 stsp free(ct_name);
5223 d34b633e 2020-10-19 stsp free(ct_name);
5225 036813ee 2019-05-09 stsp *ctp = ct;
5229 2b496619 2019-07-10 stsp return err;
5232 2b496619 2019-07-10 stsp static const struct got_error *
5233 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5234 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5235 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5236 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5237 2b496619 2019-07-10 stsp struct got_repository *repo)
5239 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5240 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5241 2b496619 2019-07-10 stsp char *subtree_path;
5242 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5243 ba580f68 2020-03-22 stsp int nentries;
5245 2b496619 2019-07-10 stsp *new_tep = NULL;
5247 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5248 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5249 2b496619 2019-07-10 stsp child_path) == -1)
5250 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5252 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5253 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5254 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5255 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5257 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5258 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5259 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5260 2b496619 2019-07-10 stsp goto done;
5262 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5263 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5264 2b496619 2019-07-10 stsp if (err) {
5265 56e0773d 2019-11-28 stsp free(new_te);
5266 2b496619 2019-07-10 stsp goto done;
5268 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5271 2b496619 2019-07-10 stsp free(subtree_path);
5272 2b496619 2019-07-10 stsp if (err == NULL)
5273 2b496619 2019-07-10 stsp *new_tep = new_te;
5274 036813ee 2019-05-09 stsp return err;
5277 036813ee 2019-05-09 stsp static const struct got_error *
5278 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5279 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5280 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5281 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5282 036813ee 2019-05-09 stsp struct got_repository *repo)
5284 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5285 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5286 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5287 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5289 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5290 ba580f68 2020-03-22 stsp *nentries = 0;
5292 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5293 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5294 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5295 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5297 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5298 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5299 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5302 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5303 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5306 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5307 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5309 036813ee 2019-05-09 stsp goto done;
5311 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5312 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5313 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5315 036813ee 2019-05-09 stsp goto done;
5316 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5318 afa376bf 2019-05-09 stsp goto done;
5319 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5320 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5322 2f51b5b3 2019-05-09 stsp goto done;
5323 ba580f68 2020-03-22 stsp (*nentries)++;
5325 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5326 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5327 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5328 2b496619 2019-07-10 stsp == NULL) {
5329 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5330 2b496619 2019-07-10 stsp child_path, path_base_tree,
5331 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5334 2b496619 2019-07-10 stsp goto done;
5335 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5337 2b496619 2019-07-10 stsp goto done;
5338 ba580f68 2020-03-22 stsp (*nentries)++;
5343 2f51b5b3 2019-05-09 stsp if (base_tree) {
5344 56e0773d 2019-11-28 stsp int i, nbase_entries;
5345 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5346 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5347 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5348 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5350 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5351 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5352 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5353 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5355 63c5ca5d 2019-08-24 stsp goto done;
5356 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5358 63c5ca5d 2019-08-24 stsp goto done;
5359 ba580f68 2020-03-22 stsp (*nentries)++;
5363 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5364 44d03001 2019-05-09 stsp int modified;
5365 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5367 036813ee 2019-05-09 stsp goto done;
5368 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5369 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5371 2f51b5b3 2019-05-09 stsp goto done;
5372 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5373 44d03001 2019-05-09 stsp if (modified) {
5374 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5375 ba580f68 2020-03-22 stsp int nsubentries;
5376 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5377 ba580f68 2020-03-22 stsp &nsubentries, te,
5378 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5379 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5381 44d03001 2019-05-09 stsp goto done;
5382 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5383 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5384 ba580f68 2020-03-22 stsp free(new_id);
5387 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5388 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5389 56e0773d 2019-11-28 stsp free(new_id);
5391 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5393 036813ee 2019-05-09 stsp goto done;
5394 ba580f68 2020-03-22 stsp (*nentries)++;
5398 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5399 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5401 f66c734c 2019-09-22 stsp goto done;
5403 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5404 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5405 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5406 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5407 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5408 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5410 2f51b5b3 2019-05-09 stsp goto done;
5411 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5413 2f51b5b3 2019-05-09 stsp goto done;
5414 ba580f68 2020-03-22 stsp (*nentries)++;
5416 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5417 b416585c 2019-05-13 stsp status_arg);
5419 afa376bf 2019-05-09 stsp goto done;
5421 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5422 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5424 2f51b5b3 2019-05-09 stsp goto done;
5425 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5427 2f51b5b3 2019-05-09 stsp goto done;
5428 ba580f68 2020-03-22 stsp (*nentries)++;
5433 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5434 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5436 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5437 2e1fa222 2020-07-23 stsp return err;
5440 2e1fa222 2020-07-23 stsp static const struct got_error *
5441 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5442 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5443 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5444 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5446 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5447 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5448 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5450 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5451 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5452 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5454 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5456 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5457 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5458 437adc9d 2020-12-10 yzhong if (err)
5459 437adc9d 2020-12-10 yzhong goto done;
5462 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5463 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5464 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5465 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5466 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5467 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5468 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5469 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5471 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5472 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5473 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5474 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5475 72fd46fa 2019-09-06 stsp !have_staged_files);
5477 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5478 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5479 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5480 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5481 72fd46fa 2019-09-06 stsp !have_staged_files);
5483 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5485 437adc9d 2020-12-10 yzhong goto done;
5486 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5487 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5488 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5489 3969253a 2020-03-07 stsp if (err) {
5490 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5491 437adc9d 2020-12-10 yzhong goto done;
5493 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5494 3969253a 2020-03-07 stsp if (err) {
5495 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5496 437adc9d 2020-12-10 yzhong goto done;
5499 437adc9d 2020-12-10 yzhong free(relpath);
5500 437adc9d 2020-12-10 yzhong relpath = NULL;
5503 437adc9d 2020-12-10 yzhong free(relpath);
5504 d56d26ce 2019-05-10 stsp return err;
5508 d56d26ce 2019-05-10 stsp static const struct got_error *
5509 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5510 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5511 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5512 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5513 735ef5ac 2019-08-03 stsp int ood_errcode)
5515 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5516 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5518 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5519 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5520 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5521 1a36436d 2019-06-10 stsp return NULL;
5523 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5524 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5526 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5527 735ef5ac 2019-08-03 stsp in_repo_path);
5528 9bead371 2019-07-28 stsp if (err) {
5529 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5530 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5531 1a36436d 2019-06-10 stsp goto done;
5532 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5533 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5535 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5536 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5537 735ef5ac 2019-08-03 stsp in_repo_path);
5538 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5539 1a36436d 2019-06-10 stsp goto done;
5540 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5544 1a36436d 2019-06-10 stsp return err;
5547 c4296144 2019-05-09 stsp const struct got_error *
5548 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5549 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5550 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5551 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5552 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5553 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5554 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5555 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5556 afa376bf 2019-05-09 stsp struct got_repository *repo)
5558 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5559 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5560 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5561 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5562 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5563 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5564 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5565 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5566 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5567 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5568 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5569 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5571 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5573 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5575 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5577 588edf97 2019-05-10 stsp goto done;
5579 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5581 588edf97 2019-05-10 stsp goto done;
5583 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5584 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5589 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5590 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5594 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5595 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5596 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5597 cf066bf8 2019-05-09 stsp char *ondisk_path;
5599 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5600 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5601 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5604 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5605 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5606 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5609 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5610 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5611 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5612 cf066bf8 2019-05-09 stsp goto done;
5614 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5615 2e1fa222 2020-07-23 stsp free(ondisk_path);
5617 cf066bf8 2019-05-09 stsp goto done;
5620 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5621 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5622 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5624 036813ee 2019-05-09 stsp goto done;
5626 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5628 de18fc63 2019-05-09 stsp goto done;
5629 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5630 f259c4c1 2021-09-24 stsp nparents++;
5631 f259c4c1 2021-09-24 stsp if (parent_id2) {
5632 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
5634 f259c4c1 2021-09-24 stsp goto done;
5635 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5636 f259c4c1 2021-09-24 stsp nparents++;
5638 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5639 f259c4c1 2021-09-24 stsp nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5640 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5641 33ad4cbe 2019-05-12 jcs free(logmsg);
5643 9d40349a 2019-05-09 stsp goto done;
5645 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5646 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5647 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5648 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5649 09f5bd90 2019-05-09 stsp goto done;
5651 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5652 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5654 09f5bd90 2019-05-09 stsp goto done;
5655 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5657 ebf99748 2019-05-09 stsp goto done;
5658 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5659 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5660 09f5bd90 2019-05-09 stsp goto done;
5662 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5663 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5665 f2c16586 2019-05-09 stsp goto done;
5666 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5668 f2c16586 2019-05-09 stsp goto done;
5670 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5672 09f5bd90 2019-05-09 stsp goto done;
5674 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5676 ebf99748 2019-05-09 stsp goto done;
5678 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
5679 588edf97 2019-05-10 stsp if (head_tree)
5680 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5681 588edf97 2019-05-10 stsp if (head_commit)
5682 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5683 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5684 2f17228e 2019-05-12 stsp if (head_ref2) {
5685 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5686 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5687 2f17228e 2019-05-12 stsp err = unlockerr;
5688 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5690 39cd0ff6 2019-07-12 stsp return err;
5693 5c1e53bc 2019-07-28 stsp static const struct got_error *
5694 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5695 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5697 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5698 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5700 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5701 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5702 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5704 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5705 5c1e53bc 2019-07-28 stsp ct_path++;
5707 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5708 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5712 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5713 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5715 5c1e53bc 2019-07-28 stsp return NULL;
5718 f0b75401 2019-08-03 stsp static const struct got_error *
5719 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5721 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5723 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5724 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5725 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5728 f0b75401 2019-08-03 stsp return NULL;
5731 5f8a88c6 2019-08-03 stsp static const struct got_error *
5732 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5733 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5735 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5736 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5738 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5739 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5741 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5742 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5743 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5744 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5745 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5746 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5749 5f8a88c6 2019-08-03 stsp return NULL;
5752 39cd0ff6 2019-07-12 stsp const struct got_error *
5753 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5754 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5755 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5756 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5757 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5758 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5760 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5761 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5762 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5763 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5764 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5765 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5766 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5767 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5768 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5770 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5772 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5774 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5776 39cd0ff6 2019-07-12 stsp goto done;
5778 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5780 39cd0ff6 2019-07-12 stsp goto done;
5782 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5784 39cd0ff6 2019-07-12 stsp goto done;
5786 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5788 39cd0ff6 2019-07-12 stsp goto done;
5790 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5791 5f8a88c6 2019-08-03 stsp &have_staged_files);
5792 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5793 5f8a88c6 2019-08-03 stsp goto done;
5794 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5795 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5797 5f8a88c6 2019-08-03 stsp goto done;
5800 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5801 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5802 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5803 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5804 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5805 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5806 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5807 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5808 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
5810 5c1e53bc 2019-07-28 stsp goto done;
5813 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5814 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5815 39cd0ff6 2019-07-12 stsp goto done;
5818 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5819 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5821 5c1e53bc 2019-07-28 stsp goto done;
5824 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5825 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5826 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5828 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5829 f0b75401 2019-08-03 stsp ct_path++;
5830 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5831 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5832 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5834 b50cabdf 2019-07-12 stsp goto done;
5838 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5839 f259c4c1 2021-09-24 stsp head_commit_id, NULL, worktree, author, committer,
5840 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5842 39cd0ff6 2019-07-12 stsp goto done;
5844 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5845 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5846 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5847 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5848 39cd0ff6 2019-07-12 stsp err = sync_err;
5850 39cd0ff6 2019-07-12 stsp if (fileindex)
5851 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5852 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5853 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5854 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5855 39cd0ff6 2019-07-12 stsp err = unlockerr;
5856 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5857 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5858 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5860 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5861 c4296144 2019-05-09 stsp return err;
5864 8656d6c4 2019-05-20 stsp const char *
5865 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5867 8656d6c4 2019-05-20 stsp return ct->path;
5870 8656d6c4 2019-05-20 stsp unsigned int
5871 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5873 8656d6c4 2019-05-20 stsp return ct->status;
5876 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5877 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5878 818c7501 2019-07-11 stsp struct got_repository *repo;
5881 818c7501 2019-07-11 stsp static const struct got_error *
5882 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5884 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5885 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5886 818c7501 2019-07-11 stsp unsigned char status;
5887 818c7501 2019-07-11 stsp struct stat sb;
5888 818c7501 2019-07-11 stsp char *ondisk_path;
5890 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5891 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5892 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5893 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5895 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5897 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5899 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5900 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5901 818c7501 2019-07-11 stsp free(ondisk_path);
5903 818c7501 2019-07-11 stsp return err;
5905 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5906 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5907 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5908 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5910 818c7501 2019-07-11 stsp return NULL;
5913 818c7501 2019-07-11 stsp const struct got_error *
5914 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5915 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5916 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5917 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5919 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5920 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5921 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5922 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5923 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5924 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5925 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5927 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5928 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5929 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5931 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5933 818c7501 2019-07-11 stsp return err;
5935 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5937 818c7501 2019-07-11 stsp goto done;
5939 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5940 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5941 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5944 818c7501 2019-07-11 stsp goto done;
5946 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5948 818c7501 2019-07-11 stsp goto done;
5950 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5952 818c7501 2019-07-11 stsp goto done;
5954 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5956 818c7501 2019-07-11 stsp goto done;
5958 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5961 e51d7b55 2020-01-04 stsp goto done;
5963 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5965 818c7501 2019-07-11 stsp goto done;
5966 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5967 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5968 e51d7b55 2020-01-04 stsp goto done;
5971 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5972 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5974 818c7501 2019-07-11 stsp goto done;
5975 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5977 818c7501 2019-07-11 stsp goto done;
5979 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5981 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5983 818c7501 2019-07-11 stsp goto done;
5985 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5987 818c7501 2019-07-11 stsp goto done;
5989 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5990 818c7501 2019-07-11 stsp worktree->base_commit_id);
5992 818c7501 2019-07-11 stsp goto done;
5993 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5995 818c7501 2019-07-11 stsp goto done;
5997 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5999 818c7501 2019-07-11 stsp goto done;
6001 818c7501 2019-07-11 stsp free(fileindex_path);
6002 818c7501 2019-07-11 stsp free(tmp_branch_name);
6003 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6004 818c7501 2019-07-11 stsp free(branch_ref_name);
6005 818c7501 2019-07-11 stsp if (branch_ref)
6006 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6007 818c7501 2019-07-11 stsp if (wt_branch)
6008 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6009 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6010 818c7501 2019-07-11 stsp if (err) {
6011 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6012 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6013 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6015 818c7501 2019-07-11 stsp if (*tmp_branch) {
6016 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6017 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6019 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6020 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6021 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6023 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6025 818c7501 2019-07-11 stsp return err;
6028 818c7501 2019-07-11 stsp const struct got_error *
6029 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6030 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6031 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6032 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6034 818c7501 2019-07-11 stsp const struct got_error *err;
6035 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6036 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6037 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6038 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6039 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6041 818c7501 2019-07-11 stsp *commit_id = NULL;
6042 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6043 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6044 3e3a69f1 2019-07-25 stsp *branch = NULL;
6045 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6047 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6049 3e3a69f1 2019-07-25 stsp return err;
6051 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6053 f032f1f7 2019-08-04 stsp goto done;
6055 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6056 f032f1f7 2019-08-04 stsp &have_staged_files);
6057 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6058 f032f1f7 2019-08-04 stsp goto done;
6059 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6060 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6061 3e3a69f1 2019-07-25 stsp goto done;
6064 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6066 f032f1f7 2019-08-04 stsp goto done;
6068 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6070 818c7501 2019-07-11 stsp goto done;
6072 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6074 818c7501 2019-07-11 stsp goto done;
6076 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6078 818c7501 2019-07-11 stsp goto done;
6080 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6082 818c7501 2019-07-11 stsp goto done;
6084 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6085 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6087 818c7501 2019-07-11 stsp goto done;
6089 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6091 818c7501 2019-07-11 stsp goto done;
6093 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6095 818c7501 2019-07-11 stsp goto done;
6097 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6098 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6100 818c7501 2019-07-11 stsp goto done;
6102 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6104 818c7501 2019-07-11 stsp goto done;
6106 818c7501 2019-07-11 stsp free(commit_ref_name);
6107 818c7501 2019-07-11 stsp free(branch_ref_name);
6108 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6109 818c7501 2019-07-11 stsp if (commit_ref)
6110 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6111 818c7501 2019-07-11 stsp if (branch_ref)
6112 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6113 818c7501 2019-07-11 stsp if (err) {
6114 818c7501 2019-07-11 stsp free(*commit_id);
6115 818c7501 2019-07-11 stsp *commit_id = NULL;
6116 818c7501 2019-07-11 stsp if (*tmp_branch) {
6117 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6118 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6120 818c7501 2019-07-11 stsp if (*new_base_branch) {
6121 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6122 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6124 818c7501 2019-07-11 stsp if (*branch) {
6125 818c7501 2019-07-11 stsp got_ref_close(*branch);
6126 818c7501 2019-07-11 stsp *branch = NULL;
6128 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6129 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6130 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6132 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6134 818c7501 2019-07-11 stsp return err;
6137 818c7501 2019-07-11 stsp const struct got_error *
6138 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6140 818c7501 2019-07-11 stsp const struct got_error *err;
6141 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6143 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6145 818c7501 2019-07-11 stsp return err;
6147 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6148 818c7501 2019-07-11 stsp free(tmp_branch_name);
6149 818c7501 2019-07-11 stsp return NULL;
6152 818c7501 2019-07-11 stsp static const struct got_error *
6153 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6154 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6156 0ebf8283 2019-07-24 stsp *logmsg = arg;
6157 818c7501 2019-07-11 stsp return NULL;
6160 818c7501 2019-07-11 stsp static const struct got_error *
6161 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6162 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6163 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6164 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6166 818c7501 2019-07-11 stsp return NULL;
6169 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6170 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6171 01757395 2019-07-12 stsp void *progress_arg;
6172 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6175 01757395 2019-07-12 stsp static const struct got_error *
6176 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6178 01757395 2019-07-12 stsp const struct got_error *err;
6179 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6181 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6183 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6185 01757395 2019-07-12 stsp return err;
6187 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6188 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6189 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6190 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6191 01757395 2019-07-12 stsp return NULL;
6193 01757395 2019-07-12 stsp p = strdup(path);
6194 01757395 2019-07-12 stsp if (p == NULL)
6195 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6197 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6198 01757395 2019-07-12 stsp if (err || new == NULL)
6200 01757395 2019-07-12 stsp return err;
6204 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6206 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6208 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6209 01757395 2019-07-12 stsp free((char *)pe->path);
6211 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6214 0ebf8283 2019-07-24 stsp static const struct got_error *
6215 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6216 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6218 818c7501 2019-07-11 stsp const struct got_error *err;
6219 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6221 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6222 818c7501 2019-07-11 stsp if (err) {
6223 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6224 818c7501 2019-07-11 stsp goto done;
6225 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6227 818c7501 2019-07-11 stsp goto done;
6228 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6230 818c7501 2019-07-11 stsp goto done;
6231 de05890f 2020-03-05 stsp } else if (is_rebase) {
6232 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6235 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6237 818c7501 2019-07-11 stsp goto done;
6238 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6239 818c7501 2019-07-11 stsp free(stored_id);
6240 818c7501 2019-07-11 stsp if (cmp != 0) {
6241 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6242 818c7501 2019-07-11 stsp goto done;
6246 0ebf8283 2019-07-24 stsp if (commit_ref)
6247 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6248 0ebf8283 2019-07-24 stsp return err;
6251 0ebf8283 2019-07-24 stsp static const struct got_error *
6252 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6253 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6254 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6255 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6256 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6257 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6259 0ebf8283 2019-07-24 stsp const struct got_error *err;
6260 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6261 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6262 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6264 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6266 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6268 0ebf8283 2019-07-24 stsp return err;
6270 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6271 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6272 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6273 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6274 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6275 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6276 818c7501 2019-07-11 stsp if (commit_ref)
6277 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6278 818c7501 2019-07-11 stsp return err;
6281 818c7501 2019-07-11 stsp const struct got_error *
6282 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6283 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6284 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6285 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6286 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6287 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6289 0ebf8283 2019-07-24 stsp const struct got_error *err;
6290 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6292 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6294 0ebf8283 2019-07-24 stsp return err;
6296 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6298 0ebf8283 2019-07-24 stsp goto done;
6300 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6301 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6302 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6304 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6305 0ebf8283 2019-07-24 stsp return err;
6308 0ebf8283 2019-07-24 stsp const struct got_error *
6309 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6310 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6311 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6312 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6313 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6314 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6316 0ebf8283 2019-07-24 stsp const struct got_error *err;
6317 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6319 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6321 0ebf8283 2019-07-24 stsp return err;
6323 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6325 0ebf8283 2019-07-24 stsp goto done;
6327 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6328 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6329 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6331 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6332 0ebf8283 2019-07-24 stsp return err;
6335 0ebf8283 2019-07-24 stsp static const struct got_error *
6336 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6337 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6338 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6339 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6340 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6342 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6343 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6344 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6345 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6346 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6347 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6348 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6350 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6351 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6353 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6355 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6357 3e3a69f1 2019-07-25 stsp return err;
6359 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6360 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6361 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6362 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6364 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6365 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6367 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6368 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6369 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6370 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6371 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6372 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6374 01757395 2019-07-12 stsp if (merged_paths) {
6375 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6376 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6377 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6378 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6381 01757395 2019-07-12 stsp goto done;
6384 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6385 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6387 01757395 2019-07-12 stsp goto done;
6390 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6391 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6392 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6394 a0e95631 2019-07-12 stsp goto done;
6395 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6396 a0e95631 2019-07-12 stsp goto done;
6399 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6401 edd02c5e 2019-07-11 stsp goto done;
6403 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6405 818c7501 2019-07-11 stsp goto done;
6407 5943eee2 2019-08-13 stsp if (new_logmsg) {
6408 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6409 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6410 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6411 5943eee2 2019-08-13 stsp goto done;
6414 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6416 5943eee2 2019-08-13 stsp goto done;
6419 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6420 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6421 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6422 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6423 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6425 a0e95631 2019-07-12 stsp goto done;
6427 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6429 a0e95631 2019-07-12 stsp goto done;
6431 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6433 a0e95631 2019-07-12 stsp goto done;
6435 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6436 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6437 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6438 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6439 a0e95631 2019-07-12 stsp err = sync_err;
6441 a0e95631 2019-07-12 stsp free(fileindex_path);
6442 a0e95631 2019-07-12 stsp free(head_commit_id);
6443 a0e95631 2019-07-12 stsp if (head_ref)
6444 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6445 818c7501 2019-07-11 stsp if (err) {
6446 818c7501 2019-07-11 stsp free(*new_commit_id);
6447 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6449 818c7501 2019-07-11 stsp return err;
6452 818c7501 2019-07-11 stsp const struct got_error *
6453 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6454 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6455 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6456 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6457 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6459 0ebf8283 2019-07-24 stsp const struct got_error *err;
6460 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6461 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6462 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6464 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6466 0ebf8283 2019-07-24 stsp return err;
6468 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6470 0ebf8283 2019-07-24 stsp goto done;
6471 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6473 0ebf8283 2019-07-24 stsp goto done;
6474 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6475 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6476 0ebf8283 2019-07-24 stsp goto done;
6479 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6480 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6482 0ebf8283 2019-07-24 stsp if (commit_ref)
6483 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6484 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6485 0ebf8283 2019-07-24 stsp free(commit_id);
6486 0ebf8283 2019-07-24 stsp return err;
6489 0ebf8283 2019-07-24 stsp const struct got_error *
6490 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6491 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6492 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6493 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6494 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6495 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6497 0ebf8283 2019-07-24 stsp const struct got_error *err;
6498 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6499 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6501 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6503 0ebf8283 2019-07-24 stsp return err;
6505 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6507 0ebf8283 2019-07-24 stsp goto done;
6509 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6510 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6512 0ebf8283 2019-07-24 stsp if (commit_ref)
6513 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6514 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6515 0ebf8283 2019-07-24 stsp return err;
6518 0ebf8283 2019-07-24 stsp const struct got_error *
6519 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6520 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6522 3e3a69f1 2019-07-25 stsp if (fileindex)
6523 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6524 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6527 69844fba 2019-07-11 stsp static const struct got_error *
6528 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6530 69844fba 2019-07-11 stsp const struct got_error *err;
6531 69844fba 2019-07-11 stsp struct got_reference *ref;
6533 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6534 69844fba 2019-07-11 stsp if (err) {
6535 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6536 69844fba 2019-07-11 stsp return NULL;
6537 69844fba 2019-07-11 stsp return err;
6540 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6541 69844fba 2019-07-11 stsp got_ref_close(ref);
6542 69844fba 2019-07-11 stsp return err;
6545 69844fba 2019-07-11 stsp static const struct got_error *
6546 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6548 69844fba 2019-07-11 stsp const struct got_error *err;
6549 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6550 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6552 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6554 69844fba 2019-07-11 stsp goto done;
6555 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6557 69844fba 2019-07-11 stsp goto done;
6559 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6561 69844fba 2019-07-11 stsp goto done;
6562 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6564 69844fba 2019-07-11 stsp goto done;
6566 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6568 69844fba 2019-07-11 stsp goto done;
6569 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6571 69844fba 2019-07-11 stsp goto done;
6573 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6575 69844fba 2019-07-11 stsp goto done;
6576 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6578 69844fba 2019-07-11 stsp goto done;
6581 69844fba 2019-07-11 stsp free(tmp_branch_name);
6582 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6583 69844fba 2019-07-11 stsp free(branch_ref_name);
6584 69844fba 2019-07-11 stsp free(commit_ref_name);
6585 e600f124 2021-03-21 stsp return err;
6588 e600f124 2021-03-21 stsp const struct got_error *
6589 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6590 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6592 e600f124 2021-03-21 stsp const struct got_error *err;
6593 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6594 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6595 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6596 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6597 e600f124 2021-03-21 stsp char *refname = NULL;
6599 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6600 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6601 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6602 e600f124 2021-03-21 stsp branch_name += 11;
6604 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6606 e600f124 2021-03-21 stsp return err;
6608 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6609 e600f124 2021-03-21 stsp new_id_str) == -1) {
6610 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6611 e600f124 2021-03-21 stsp goto done;
6614 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6616 e600f124 2021-03-21 stsp goto done;
6618 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6620 e600f124 2021-03-21 stsp goto done;
6622 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6624 e600f124 2021-03-21 stsp free(new_id_str);
6625 e600f124 2021-03-21 stsp free(refname);
6626 e600f124 2021-03-21 stsp free(old_commit_id);
6628 e600f124 2021-03-21 stsp got_ref_close(ref);
6629 69844fba 2019-07-11 stsp return err;
6632 818c7501 2019-07-11 stsp const struct got_error *
6633 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6634 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6635 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6636 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6638 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6639 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6640 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6642 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6644 818c7501 2019-07-11 stsp return err;
6646 e600f124 2021-03-21 stsp if (create_backup) {
6647 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6648 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6650 e600f124 2021-03-21 stsp goto done;
6653 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6655 818c7501 2019-07-11 stsp goto done;
6657 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6659 818c7501 2019-07-11 stsp goto done;
6661 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6663 818c7501 2019-07-11 stsp goto done;
6665 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6667 a615e0e7 2020-12-16 stsp goto done;
6669 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6671 a615e0e7 2020-12-16 stsp goto done;
6672 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6673 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6674 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6675 a615e0e7 2020-12-16 stsp err = sync_err;
6677 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6678 a615e0e7 2020-12-16 stsp free(fileindex_path);
6679 818c7501 2019-07-11 stsp free(new_head_commit_id);
6680 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6681 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6682 818c7501 2019-07-11 stsp err = unlockerr;
6683 818c7501 2019-07-11 stsp return err;
6686 818c7501 2019-07-11 stsp const struct got_error *
6687 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6688 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6689 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6690 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6692 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6693 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6694 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6695 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6696 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6697 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6699 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6701 818c7501 2019-07-11 stsp return err;
6703 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6704 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6706 818c7501 2019-07-11 stsp goto done;
6708 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6710 818c7501 2019-07-11 stsp goto done;
6713 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6714 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6715 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6717 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6719 818c7501 2019-07-11 stsp goto done;
6721 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6723 818c7501 2019-07-11 stsp goto done;
6725 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6726 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6728 ca355955 2019-07-12 stsp goto done;
6730 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6732 ca355955 2019-07-12 stsp goto done;
6734 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6736 818c7501 2019-07-11 stsp goto done;
6738 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6739 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6740 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6741 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6742 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6743 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6744 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6745 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
6746 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6747 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
6749 1f1abb7e 2019-08-08 stsp goto sync;
6751 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6752 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6754 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6755 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6756 ca355955 2019-07-12 stsp err = sync_err;
6758 818c7501 2019-07-11 stsp got_ref_close(resolved);
6759 a3a2faf2 2019-07-12 stsp free(tree_id);
6760 818c7501 2019-07-11 stsp free(commit_id);
6761 0ebf8283 2019-07-24 stsp if (fileindex)
6762 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6763 0ebf8283 2019-07-24 stsp free(fileindex_path);
6765 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6766 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6767 0ebf8283 2019-07-24 stsp err = unlockerr;
6768 0ebf8283 2019-07-24 stsp return err;
6771 0ebf8283 2019-07-24 stsp const struct got_error *
6772 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6773 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6774 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6775 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6777 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6778 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6779 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6780 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6781 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6782 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6783 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6784 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6786 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6787 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6788 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6789 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6791 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6793 0ebf8283 2019-07-24 stsp return err;
6795 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6797 0ebf8283 2019-07-24 stsp goto done;
6799 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6800 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6801 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6804 0ebf8283 2019-07-24 stsp goto done;
6806 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6808 0ebf8283 2019-07-24 stsp goto done;
6810 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6812 0ebf8283 2019-07-24 stsp goto done;
6814 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6815 0ebf8283 2019-07-24 stsp worktree);
6817 0ebf8283 2019-07-24 stsp goto done;
6819 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6822 0ebf8283 2019-07-24 stsp goto done;
6824 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6826 0ebf8283 2019-07-24 stsp goto done;
6828 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6830 0ebf8283 2019-07-24 stsp goto done;
6832 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6833 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6835 0ebf8283 2019-07-24 stsp goto done;
6836 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6838 0ebf8283 2019-07-24 stsp goto done;
6839 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6840 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6841 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6842 0ebf8283 2019-07-24 stsp goto done;
6845 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6846 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6848 0ebf8283 2019-07-24 stsp goto done;
6849 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6851 0ebf8283 2019-07-24 stsp goto done;
6853 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6855 0ebf8283 2019-07-24 stsp goto done;
6857 0ebf8283 2019-07-24 stsp free(fileindex_path);
6858 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6859 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6860 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6861 0ebf8283 2019-07-24 stsp if (wt_branch)
6862 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6863 0ebf8283 2019-07-24 stsp if (err) {
6864 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6865 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6866 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6868 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6869 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6870 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6872 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6873 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6874 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6875 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6877 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6879 0ebf8283 2019-07-24 stsp return err;
6882 0ebf8283 2019-07-24 stsp const struct got_error *
6883 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6884 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6886 3e3a69f1 2019-07-25 stsp if (fileindex)
6887 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6888 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6891 0ebf8283 2019-07-24 stsp const struct got_error *
6892 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6893 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6895 0ebf8283 2019-07-24 stsp const struct got_error *err;
6896 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6898 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6900 0ebf8283 2019-07-24 stsp return err;
6902 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6903 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6904 0ebf8283 2019-07-24 stsp return NULL;
6907 0ebf8283 2019-07-24 stsp const struct got_error *
6908 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6909 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6910 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6911 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6913 0ebf8283 2019-07-24 stsp const struct got_error *err;
6914 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6915 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6916 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6917 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6918 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6919 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6921 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6922 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6923 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6924 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6926 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6928 3e3a69f1 2019-07-25 stsp return err;
6930 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6932 f032f1f7 2019-08-04 stsp goto done;
6934 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6935 f032f1f7 2019-08-04 stsp &have_staged_files);
6936 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6937 f032f1f7 2019-08-04 stsp goto done;
6938 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6939 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6940 3e3a69f1 2019-07-25 stsp goto done;
6943 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6945 f032f1f7 2019-08-04 stsp goto done;
6947 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6949 0ebf8283 2019-07-24 stsp goto done;
6951 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6953 0ebf8283 2019-07-24 stsp goto done;
6955 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6956 0ebf8283 2019-07-24 stsp worktree);
6958 0ebf8283 2019-07-24 stsp goto done;
6960 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6962 0ebf8283 2019-07-24 stsp goto done;
6964 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6966 0ebf8283 2019-07-24 stsp goto done;
6967 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6969 0ebf8283 2019-07-24 stsp goto done;
6971 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6973 0ebf8283 2019-07-24 stsp goto done;
6974 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6976 0ebf8283 2019-07-24 stsp goto done;
6978 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6980 0ebf8283 2019-07-24 stsp goto done;
6982 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6983 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6984 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6985 0ebf8283 2019-07-24 stsp if (commit_ref)
6986 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6987 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6988 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6989 0ebf8283 2019-07-24 stsp if (err) {
6990 0ebf8283 2019-07-24 stsp free(*commit_id);
6991 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6992 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6993 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6994 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6995 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6996 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6998 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6999 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7000 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7002 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7004 0ebf8283 2019-07-24 stsp return err;
7007 0ebf8283 2019-07-24 stsp static const struct got_error *
7008 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7010 0ebf8283 2019-07-24 stsp const struct got_error *err;
7011 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7012 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7014 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7016 0ebf8283 2019-07-24 stsp goto done;
7017 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7019 0ebf8283 2019-07-24 stsp goto done;
7021 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7022 0ebf8283 2019-07-24 stsp worktree);
7024 0ebf8283 2019-07-24 stsp goto done;
7025 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7027 0ebf8283 2019-07-24 stsp goto done;
7029 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7031 0ebf8283 2019-07-24 stsp goto done;
7032 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7034 0ebf8283 2019-07-24 stsp goto done;
7036 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7038 0ebf8283 2019-07-24 stsp goto done;
7039 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7041 0ebf8283 2019-07-24 stsp goto done;
7043 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7044 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7045 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7046 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7047 0ebf8283 2019-07-24 stsp return err;
7050 0ebf8283 2019-07-24 stsp const struct got_error *
7051 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7052 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7053 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7054 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7056 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7057 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7058 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7059 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7060 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7062 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7064 0ebf8283 2019-07-24 stsp return err;
7066 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7067 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7069 0ebf8283 2019-07-24 stsp goto done;
7071 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7073 0ebf8283 2019-07-24 stsp goto done;
7075 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7077 0ebf8283 2019-07-24 stsp goto done;
7079 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7080 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7082 0ebf8283 2019-07-24 stsp goto done;
7084 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7086 0ebf8283 2019-07-24 stsp goto done;
7088 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7090 0ebf8283 2019-07-24 stsp goto done;
7092 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7093 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7094 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7095 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7096 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7097 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7098 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7099 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7100 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7101 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7103 1f1abb7e 2019-08-08 stsp goto sync;
7105 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7106 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7108 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7109 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7110 0ebf8283 2019-07-24 stsp err = sync_err;
7112 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7113 0ebf8283 2019-07-24 stsp free(tree_id);
7114 818c7501 2019-07-11 stsp free(fileindex_path);
7116 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7117 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7118 818c7501 2019-07-11 stsp err = unlockerr;
7119 818c7501 2019-07-11 stsp return err;
7122 0ebf8283 2019-07-24 stsp const struct got_error *
7123 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7124 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7125 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7127 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7128 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7129 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7130 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7132 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7134 0ebf8283 2019-07-24 stsp return err;
7136 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7137 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7139 e600f124 2021-03-21 stsp goto done;
7141 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7142 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7144 0ebf8283 2019-07-24 stsp goto done;
7146 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7148 0ebf8283 2019-07-24 stsp goto done;
7150 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7152 0ebf8283 2019-07-24 stsp goto done;
7154 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7156 0ebf8283 2019-07-24 stsp goto done;
7158 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7160 a615e0e7 2020-12-16 stsp goto done;
7162 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7164 a615e0e7 2020-12-16 stsp goto done;
7165 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7166 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7167 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7168 a615e0e7 2020-12-16 stsp err = sync_err;
7170 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7171 a615e0e7 2020-12-16 stsp free(fileindex_path);
7172 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7173 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7174 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7175 0ebf8283 2019-07-24 stsp err = unlockerr;
7176 0ebf8283 2019-07-24 stsp return err;
7179 0ebf8283 2019-07-24 stsp const struct got_error *
7180 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7181 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7183 0ebf8283 2019-07-24 stsp const struct got_error *err;
7184 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7186 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7188 0ebf8283 2019-07-24 stsp return err;
7190 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7192 0ebf8283 2019-07-24 stsp goto done;
7194 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7196 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7197 2822a352 2019-10-15 stsp return err;
7200 2822a352 2019-10-15 stsp const struct got_error *
7201 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7202 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7203 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7204 2822a352 2019-10-15 stsp struct got_repository *repo)
7206 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7207 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7208 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7210 2822a352 2019-10-15 stsp *fileindex = NULL;
7211 2822a352 2019-10-15 stsp *branch_ref = NULL;
7212 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7214 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7216 2822a352 2019-10-15 stsp return err;
7218 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7219 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7220 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7221 2822a352 2019-10-15 stsp "update -b or different branch name required");
7222 2822a352 2019-10-15 stsp goto done;
7225 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7227 2822a352 2019-10-15 stsp goto done;
7229 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7230 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7231 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7232 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7235 2822a352 2019-10-15 stsp goto done;
7237 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7239 2822a352 2019-10-15 stsp goto done;
7241 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7242 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7244 2822a352 2019-10-15 stsp if (err) {
7245 2822a352 2019-10-15 stsp if (*branch_ref) {
7246 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7247 2822a352 2019-10-15 stsp *branch_ref = NULL;
7249 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7250 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7251 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7253 2822a352 2019-10-15 stsp if (*fileindex) {
7254 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7255 2822a352 2019-10-15 stsp *fileindex = NULL;
7257 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7259 0cb83759 2019-08-03 stsp return err;
7262 2822a352 2019-10-15 stsp const struct got_error *
7263 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7264 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7265 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7266 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7267 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7269 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7270 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7271 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7273 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7275 2822a352 2019-10-15 stsp goto done;
7277 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7279 2822a352 2019-10-15 stsp goto done;
7281 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7282 2822a352 2019-10-15 stsp worktree->path_prefix);
7284 2822a352 2019-10-15 stsp goto done;
7286 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7288 2822a352 2019-10-15 stsp goto done;
7290 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7291 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7293 2822a352 2019-10-15 stsp goto sync;
7295 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7297 2822a352 2019-10-15 stsp goto sync;
7299 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7301 6e210706 2021-01-22 stsp goto sync;
7303 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7305 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7306 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7307 2822a352 2019-10-15 stsp err = sync_err;
7310 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7311 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7312 2822a352 2019-10-15 stsp err = unlockerr;
7313 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7315 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7316 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7317 2822a352 2019-10-15 stsp err = unlockerr;
7318 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7320 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7321 2822a352 2019-10-15 stsp free(fileindex_path);
7322 2822a352 2019-10-15 stsp free(tree_id);
7324 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7325 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7326 2822a352 2019-10-15 stsp err = unlockerr;
7327 2822a352 2019-10-15 stsp return err;
7330 2822a352 2019-10-15 stsp const struct got_error *
7331 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7332 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7333 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7335 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7337 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7339 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7341 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7342 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7343 8b692cd0 2019-10-21 stsp err = unlockerr;
7344 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7346 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7347 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7348 8b692cd0 2019-10-21 stsp err = unlockerr;
7349 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7351 f259c4c1 2021-09-24 stsp return err;
7354 f259c4c1 2021-09-24 stsp const struct got_error *
7355 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7356 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7358 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7359 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7361 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7363 f259c4c1 2021-09-24 stsp goto done;
7365 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7367 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7368 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7369 f259c4c1 2021-09-24 stsp err = sync_err;
7371 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7372 f259c4c1 2021-09-24 stsp free(fileindex_path);
7373 8b692cd0 2019-10-21 stsp return err;
7376 f259c4c1 2021-09-24 stsp static const struct got_error *
7377 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7379 f259c4c1 2021-09-24 stsp const struct got_error *err;
7380 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7382 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7384 f259c4c1 2021-09-24 stsp goto done;
7385 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7387 f259c4c1 2021-09-24 stsp goto done;
7389 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7391 f259c4c1 2021-09-24 stsp goto done;
7392 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7394 f259c4c1 2021-09-24 stsp goto done;
7397 f259c4c1 2021-09-24 stsp free(branch_refname);
7398 f259c4c1 2021-09-24 stsp free(commit_refname);
7399 f259c4c1 2021-09-24 stsp return err;
7402 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7403 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7404 f259c4c1 2021-09-24 stsp const char *branch_name;
7407 f259c4c1 2021-09-24 stsp static const struct got_error *
7408 f259c4c1 2021-09-24 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7409 f259c4c1 2021-09-24 stsp void *arg)
7411 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7413 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7414 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7415 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7417 f259c4c1 2021-09-24 stsp return NULL;
7421 f259c4c1 2021-09-24 stsp const struct got_error *
7422 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7423 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7424 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7425 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7426 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7427 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7429 f259c4c1 2021-09-24 stsp const struct got_error *err;
7430 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7432 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7434 f259c4c1 2021-09-24 stsp goto done;
7436 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7437 f259c4c1 2021-09-24 stsp worktree);
7439 f259c4c1 2021-09-24 stsp goto done;
7441 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7442 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7443 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7445 f259c4c1 2021-09-24 stsp free(fileindex_path);
7446 f259c4c1 2021-09-24 stsp return err;
7449 f259c4c1 2021-09-24 stsp const struct got_error *
7450 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7451 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7452 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7453 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7454 0ff8d236 2021-09-28 stsp struct got_repository *repo,
7455 0ff8d236 2021-09-28 stsp got_worktree_status_cb status_cb, void *status_arg)
7458 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7459 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7460 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7461 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7462 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7463 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7464 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7465 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7466 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7468 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7470 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7472 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7474 f259c4c1 2021-09-24 stsp goto done;
7476 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7478 f259c4c1 2021-09-24 stsp goto done;
7480 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7482 f259c4c1 2021-09-24 stsp goto done;
7484 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7485 f259c4c1 2021-09-24 stsp &have_staged_files);
7486 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7487 f259c4c1 2021-09-24 stsp goto done;
7488 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7489 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7490 f259c4c1 2021-09-24 stsp goto done;
7493 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7494 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7495 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7496 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7497 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7498 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7499 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7500 62da3196 2021-10-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7502 f259c4c1 2021-09-24 stsp goto done;
7504 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7505 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7506 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7507 f259c4c1 2021-09-24 stsp goto done;
7510 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7511 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7512 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
7514 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
7515 f259c4c1 2021-09-24 stsp ct_path++;
7516 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
7517 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7518 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7520 f259c4c1 2021-09-24 stsp goto done;
7524 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
7525 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
7526 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
7527 f259c4c1 2021-09-24 stsp head_commit_id, branch_tip, worktree, author, committer,
7528 0ff8d236 2021-09-28 stsp merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7530 f259c4c1 2021-09-24 stsp goto done;
7532 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
7533 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
7534 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7535 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7536 f259c4c1 2021-09-24 stsp err = sync_err;
7538 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7539 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7540 f259c4c1 2021-09-24 stsp free_commitable(ct);
7542 f259c4c1 2021-09-24 stsp got_pathlist_free(&commitable_paths);
7543 f259c4c1 2021-09-24 stsp free(fileindex_path);
7544 f259c4c1 2021-09-24 stsp return err;
7547 f259c4c1 2021-09-24 stsp const struct got_error *
7548 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
7549 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
7551 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7552 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7554 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7556 f259c4c1 2021-09-24 stsp goto done;
7558 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7560 f259c4c1 2021-09-24 stsp goto done;
7561 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7562 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7563 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7564 f259c4c1 2021-09-24 stsp err = sync_err;
7566 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7567 f259c4c1 2021-09-24 stsp free(fileindex_path);
7568 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7569 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7570 f259c4c1 2021-09-24 stsp err = unlockerr;
7571 f259c4c1 2021-09-24 stsp return err;
7574 f259c4c1 2021-09-24 stsp const struct got_error *
7575 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7576 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7578 f259c4c1 2021-09-24 stsp const struct got_error *err;
7579 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
7580 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
7582 f259c4c1 2021-09-24 stsp *in_progress = 0;
7584 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7586 f259c4c1 2021-09-24 stsp return err;
7587 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7588 793fcac3 2021-09-24 stsp free(branch_refname);
7589 f259c4c1 2021-09-24 stsp if (err) {
7590 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
7591 f259c4c1 2021-09-24 stsp return err;
7593 f259c4c1 2021-09-24 stsp *in_progress = 1;
7595 f259c4c1 2021-09-24 stsp return NULL;
7598 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
7599 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7600 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
7602 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
7603 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7604 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7605 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7606 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
7607 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7608 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
7610 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7612 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7614 f259c4c1 2021-09-24 stsp return err;
7616 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7618 f259c4c1 2021-09-24 stsp goto done;
7620 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
7621 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
7622 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
7623 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7626 f259c4c1 2021-09-24 stsp goto done;
7628 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7630 f259c4c1 2021-09-24 stsp return err;
7632 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7634 f259c4c1 2021-09-24 stsp return err;
7636 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7639 f259c4c1 2021-09-24 stsp goto done;
7641 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7643 f259c4c1 2021-09-24 stsp goto done;
7645 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7646 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7647 f259c4c1 2021-09-24 stsp goto done;
7650 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
7652 f259c4c1 2021-09-24 stsp goto done;
7654 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7656 f259c4c1 2021-09-24 stsp goto done;
7657 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
7659 f259c4c1 2021-09-24 stsp goto done;
7661 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7663 f259c4c1 2021-09-24 stsp goto done;
7664 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
7666 f259c4c1 2021-09-24 stsp goto done;
7669 f259c4c1 2021-09-24 stsp free(branch_refname);
7670 f259c4c1 2021-09-24 stsp free(commit_refname);
7671 f259c4c1 2021-09-24 stsp free(fileindex_path);
7672 f259c4c1 2021-09-24 stsp if (branch_ref)
7673 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7674 f259c4c1 2021-09-24 stsp if (commit_ref)
7675 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7676 f259c4c1 2021-09-24 stsp if (wt_branch)
7677 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
7678 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
7679 f259c4c1 2021-09-24 stsp if (err) {
7680 f259c4c1 2021-09-24 stsp if (*fileindex) {
7681 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7682 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7684 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7686 f259c4c1 2021-09-24 stsp return err;
7689 f259c4c1 2021-09-24 stsp const struct got_error *
7690 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
7691 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7692 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7694 f259c4c1 2021-09-24 stsp const struct got_error *err;
7695 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
7696 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7697 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7698 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7700 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7701 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7702 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7704 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7706 f259c4c1 2021-09-24 stsp return err;
7708 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7710 f259c4c1 2021-09-24 stsp goto done;
7712 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7713 f259c4c1 2021-09-24 stsp &have_staged_files);
7714 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7715 f259c4c1 2021-09-24 stsp goto done;
7716 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7717 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7718 f259c4c1 2021-09-24 stsp goto done;
7721 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7723 f259c4c1 2021-09-24 stsp goto done;
7725 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7727 f259c4c1 2021-09-24 stsp goto done;
7729 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7731 f259c4c1 2021-09-24 stsp goto done;
7733 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
7734 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7735 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
7736 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
7737 f259c4c1 2021-09-24 stsp goto done;
7739 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7740 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
7741 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
7742 f259c4c1 2021-09-24 stsp goto done;
7745 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7747 f259c4c1 2021-09-24 stsp goto done;
7749 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
7751 f259c4c1 2021-09-24 stsp goto done;
7753 f259c4c1 2021-09-24 stsp free(commit_refname);
7754 f259c4c1 2021-09-24 stsp free(branch_refname);
7755 f259c4c1 2021-09-24 stsp free(fileindex_path);
7756 f259c4c1 2021-09-24 stsp if (commit_ref)
7757 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7758 f259c4c1 2021-09-24 stsp if (branch_ref)
7759 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7760 f259c4c1 2021-09-24 stsp if (err) {
7761 f259c4c1 2021-09-24 stsp if (*branch_name) {
7762 f259c4c1 2021-09-24 stsp free(*branch_name);
7763 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7765 f259c4c1 2021-09-24 stsp free(*branch_tip);
7766 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7767 f259c4c1 2021-09-24 stsp if (*fileindex) {
7768 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7769 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7771 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7773 f259c4c1 2021-09-24 stsp return err;
7776 f259c4c1 2021-09-24 stsp const struct got_error *
7777 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
7778 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7779 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7781 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7782 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
7783 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7784 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
7785 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
7787 f259c4c1 2021-09-24 stsp err = got_object_id_by_path(&tree_id, repo,
7788 f259c4c1 2021-09-24 stsp worktree->base_commit_id, worktree->path_prefix);
7790 f259c4c1 2021-09-24 stsp goto done;
7792 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7794 f259c4c1 2021-09-24 stsp goto done;
7796 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7798 f259c4c1 2021-09-24 stsp goto done;
7800 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
7801 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
7802 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
7803 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
7804 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
7805 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
7806 f259c4c1 2021-09-24 stsp rfa.repo = repo;
7807 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
7808 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7809 62da3196 2021-10-01 stsp revert_file, &rfa, NULL, NULL, 1, 0);
7811 f259c4c1 2021-09-24 stsp goto sync;
7813 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7814 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7816 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7817 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7818 f259c4c1 2021-09-24 stsp err = sync_err;
7820 f259c4c1 2021-09-24 stsp free(tree_id);
7821 f259c4c1 2021-09-24 stsp free(commit_id);
7822 f259c4c1 2021-09-24 stsp if (fileindex)
7823 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7824 f259c4c1 2021-09-24 stsp free(fileindex_path);
7826 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7827 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7828 f259c4c1 2021-09-24 stsp err = unlockerr;
7829 f259c4c1 2021-09-24 stsp return err;
7832 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7833 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7834 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7835 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7836 2db2652d 2019-08-07 stsp struct got_repository *repo;
7837 2db2652d 2019-08-07 stsp int have_changes;
7840 2db2652d 2019-08-07 stsp const struct got_error *
7841 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7842 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7843 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7844 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7846 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7847 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7848 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7849 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7850 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7851 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7853 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7854 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7855 8b13ce36 2019-08-08 stsp return NULL;
7856 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7857 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7859 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7860 735ef5ac 2019-08-03 stsp if (ie == NULL)
7861 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7863 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7864 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7865 735ef5ac 2019-08-03 stsp relpath) == -1)
7866 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7868 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7869 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7870 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7871 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7874 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7875 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7876 3aa5969e 2019-08-06 stsp goto done;
7877 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7878 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7879 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7880 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7881 735ef5ac 2019-08-03 stsp goto done;
7884 2db2652d 2019-08-07 stsp a->have_changes = 1;
7886 735ef5ac 2019-08-03 stsp p = in_repo_path;
7887 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7889 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7890 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7891 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7893 735ef5ac 2019-08-03 stsp free(in_repo_path);
7894 dc424a06 2019-08-07 stsp return err;
7897 2db2652d 2019-08-07 stsp struct stage_path_arg {
7898 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7899 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7900 2db2652d 2019-08-07 stsp struct got_repository *repo;
7901 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7902 2db2652d 2019-08-07 stsp void *status_arg;
7903 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7904 2db2652d 2019-08-07 stsp void *patch_arg;
7905 7b5dc508 2019-10-28 stsp int staged_something;
7906 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7909 2db2652d 2019-08-07 stsp static const struct got_error *
7910 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7911 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7912 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7913 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7915 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7916 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7917 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7918 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7919 0cb83759 2019-08-03 stsp uint32_t stage;
7920 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7921 0aeb8099 2020-07-23 stsp struct stat sb;
7923 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7924 8b13ce36 2019-08-08 stsp return NULL;
7926 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7927 d3e7c587 2019-08-03 stsp if (ie == NULL)
7928 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7930 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7931 2db2652d 2019-08-07 stsp relpath)== -1)
7932 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7934 0cb83759 2019-08-03 stsp switch (status) {
7935 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7936 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7937 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7938 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7939 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7942 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7943 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7944 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7945 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7946 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7949 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7952 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7953 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7954 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7955 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7956 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7960 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7961 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7964 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7965 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7966 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7967 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7969 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7970 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7971 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7972 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7973 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7974 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7975 35213c7c 2020-07-23 stsp ssize_t target_len;
7976 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7977 35213c7c 2020-07-23 stsp sizeof(target_path));
7978 35213c7c 2020-07-23 stsp if (target_len == -1) {
7979 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7980 35213c7c 2020-07-23 stsp ondisk_path);
7983 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7984 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7985 35213c7c 2020-07-23 stsp a->worktree->root_path);
7988 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7989 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7990 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7994 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7995 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7996 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7998 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7999 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8001 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8002 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
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 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8009 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8011 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8012 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8014 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8015 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8016 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8017 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8020 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8022 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8023 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8027 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8028 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8029 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8030 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8032 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8033 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8036 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8038 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8039 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8041 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8042 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8045 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8049 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8050 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8051 dc424a06 2019-08-07 stsp free(path_content);
8052 2db2652d 2019-08-07 stsp free(ondisk_path);
8053 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8054 0ebf8283 2019-07-24 stsp return err;
8057 0cb83759 2019-08-03 stsp const struct got_error *
8058 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8059 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8060 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8061 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8062 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8064 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8065 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8066 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8067 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8068 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8069 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8070 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8071 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8073 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8075 0cb83759 2019-08-03 stsp return err;
8077 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8078 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8080 735ef5ac 2019-08-03 stsp goto done;
8081 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8083 735ef5ac 2019-08-03 stsp goto done;
8084 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8086 0cb83759 2019-08-03 stsp goto done;
8088 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8089 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8090 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8091 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8092 2db2652d 2019-08-07 stsp oka.repo = repo;
8093 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8094 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8095 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8096 62da3196 2021-10-01 stsp check_stage_ok, &oka, NULL, NULL, 1, 0);
8098 735ef5ac 2019-08-03 stsp goto done;
8100 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8101 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8102 2db2652d 2019-08-07 stsp goto done;
8105 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8106 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8107 2db2652d 2019-08-07 stsp spa.repo = repo;
8108 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8109 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8110 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8111 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8112 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8113 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8114 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8115 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8116 62da3196 2021-10-01 stsp stage_path, &spa, NULL, NULL, 1, 0);
8118 2db2652d 2019-08-07 stsp goto done;
8120 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8121 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8122 7b5dc508 2019-10-28 stsp goto done;
8125 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8126 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8127 0cb83759 2019-08-03 stsp err = sync_err;
8129 735ef5ac 2019-08-03 stsp if (head_ref)
8130 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8131 735ef5ac 2019-08-03 stsp free(head_commit_id);
8132 0cb83759 2019-08-03 stsp free(fileindex_path);
8133 0cb83759 2019-08-03 stsp if (fileindex)
8134 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8135 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8136 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8137 0cb83759 2019-08-03 stsp err = unlockerr;
8138 0cb83759 2019-08-03 stsp return err;
8141 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8142 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8143 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8144 ad493afc 2019-08-03 stsp struct got_repository *repo;
8145 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8146 ad493afc 2019-08-03 stsp void *progress_arg;
8147 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8148 2e1f37b0 2019-08-08 stsp void *patch_arg;
8151 2e1f37b0 2019-08-08 stsp static const struct got_error *
8152 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8153 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8154 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8155 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8156 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8158 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8159 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8160 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8161 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8162 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8163 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8164 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8166 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8167 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8169 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8171 2e1f37b0 2019-08-08 stsp return err;
8172 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8174 2e1f37b0 2019-08-08 stsp goto done;
8176 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8178 2e1f37b0 2019-08-08 stsp goto done;
8180 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8182 2e1f37b0 2019-08-08 stsp goto done;
8184 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8186 2e1f37b0 2019-08-08 stsp goto done;
8188 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8190 2e1f37b0 2019-08-08 stsp goto done;
8192 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8194 2e1f37b0 2019-08-08 stsp goto done;
8196 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8197 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8199 2e1f37b0 2019-08-08 stsp goto done;
8201 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8202 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8204 2e1f37b0 2019-08-08 stsp goto done;
8205 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8206 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8208 2e1f37b0 2019-08-08 stsp goto done;
8210 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8211 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8212 2e1f37b0 2019-08-08 stsp goto done;
8214 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8215 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8216 2e1f37b0 2019-08-08 stsp goto done;
8218 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8219 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8220 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
8221 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8222 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8223 fe621944 2020-11-10 stsp nchanges++;
8225 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8226 2e1f37b0 2019-08-08 stsp int choice;
8227 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8228 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8229 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8230 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8232 2e1f37b0 2019-08-08 stsp goto done;
8233 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8234 2e1f37b0 2019-08-08 stsp have_content = 1;
8236 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8237 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8240 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8241 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8242 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8244 2e1f37b0 2019-08-08 stsp free(label1);
8246 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8247 2e1f37b0 2019-08-08 stsp if (staged_blob)
8248 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8249 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8250 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8251 fe621944 2020-11-10 stsp err = free_err;
8252 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8253 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8254 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8255 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8256 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8257 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8258 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8259 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8260 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8261 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8262 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8263 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8264 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8265 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8266 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8267 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8268 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8269 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8270 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8272 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8273 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8274 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8275 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8276 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8277 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8278 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8280 2e1f37b0 2019-08-08 stsp free(path1);
8281 2e1f37b0 2019-08-08 stsp free(path2);
8282 fda8017d 2020-07-23 stsp return err;
8285 fda8017d 2020-07-23 stsp static const struct got_error *
8286 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8287 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8288 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8289 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8290 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8291 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8292 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8294 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8295 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8296 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8297 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8298 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8299 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8300 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8301 fda8017d 2020-07-23 stsp struct stat sb;
8303 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8304 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8305 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8307 fda8017d 2020-07-23 stsp return err;
8309 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8310 fda8017d 2020-07-23 stsp return NULL;
8312 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8313 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8314 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8316 fda8017d 2020-07-23 stsp goto done;
8319 00fe21f2 2021-12-31 stsp f = fopen(path_unstaged_content, "re");
8320 fda8017d 2020-07-23 stsp if (f == NULL) {
8321 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8322 fda8017d 2020-07-23 stsp path_unstaged_content);
8323 fda8017d 2020-07-23 stsp goto done;
8325 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8326 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8327 fda8017d 2020-07-23 stsp goto done;
8329 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8330 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8331 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8333 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8334 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8335 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8336 fda8017d 2020-07-23 stsp goto done;
8338 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8339 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8340 fda8017d 2020-07-23 stsp goto done;
8342 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8343 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8344 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8345 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8346 fda8017d 2020-07-23 stsp progress_arg);
8348 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8350 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8352 67a66647 2021-05-31 stsp return err;
8354 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8355 67a66647 2021-05-31 stsp parent) == -1) {
8356 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8357 67a66647 2021-05-31 stsp base_path = NULL;
8358 67a66647 2021-05-31 stsp goto done;
8361 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8363 67a66647 2021-05-31 stsp goto done;
8364 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8365 67a66647 2021-05-31 stsp blob_base);
8367 67a66647 2021-05-31 stsp goto done;
8370 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8371 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8373 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8374 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8375 eec2f5a9 2021-06-03 stsp ondisk_path);
8377 eec2f5a9 2021-06-03 stsp goto done;
8380 8bd0cdad 2021-12-31 stsp fd = open(ondisk_path,
8381 8bd0cdad 2021-12-31 stsp O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8382 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8383 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8384 eec2f5a9 2021-06-03 stsp goto done;
8386 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8387 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8388 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8389 eec2f5a9 2021-06-03 stsp close(fd);
8390 eec2f5a9 2021-06-03 stsp goto done;
8394 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8395 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8396 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8397 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8398 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8401 fda8017d 2020-07-23 stsp goto done;
8403 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8404 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8405 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8407 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8408 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8411 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8412 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8413 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8414 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8415 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8416 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8417 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8418 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8419 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8420 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8421 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8422 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8423 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8424 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8425 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8426 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8427 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8428 67a66647 2021-05-31 stsp free(blob_base_path);
8429 67a66647 2021-05-31 stsp free(parent);
8430 67a66647 2021-05-31 stsp free(base_path);
8431 2e1f37b0 2019-08-08 stsp return err;
8434 ad493afc 2019-08-03 stsp static const struct got_error *
8435 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8436 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8437 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8438 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8440 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8441 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8442 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8443 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8444 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8445 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8446 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8447 9bc94a15 2019-08-03 stsp struct stat sb;
8449 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8450 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8451 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8452 2e1f37b0 2019-08-08 stsp return NULL;
8454 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8455 ad493afc 2019-08-03 stsp if (ie == NULL)
8456 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8458 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8460 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8462 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8463 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8465 f69721c3 2019-10-21 stsp goto done;
8466 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8467 f69721c3 2019-10-21 stsp id_str) == -1) {
8468 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8469 f69721c3 2019-10-21 stsp goto done;
8472 ad493afc 2019-08-03 stsp switch (staged_status) {
8473 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8474 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8475 ad493afc 2019-08-03 stsp blob_id, 8192);
8478 ad493afc 2019-08-03 stsp /* fall through */
8479 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8480 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8481 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8482 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8483 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8484 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8487 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8490 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8491 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8492 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8493 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8494 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8495 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8498 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8499 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8502 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8503 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8504 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8505 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8506 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8507 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8508 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8509 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8510 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8512 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8513 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8514 36bf999c 2020-07-23 stsp char *staged_target;
8515 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8516 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8518 36bf999c 2020-07-23 stsp goto done;
8519 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8520 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8521 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8522 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8523 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8524 36bf999c 2020-07-23 stsp free(staged_target);
8526 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8527 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8528 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8529 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8530 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8531 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8532 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8536 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8539 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8540 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8541 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8542 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8545 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8546 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8547 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8548 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8549 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8552 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8554 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8555 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8559 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8560 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8561 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8562 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8565 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8569 ad493afc 2019-08-03 stsp free(ondisk_path);
8570 ad493afc 2019-08-03 stsp if (blob_base)
8571 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8572 ad493afc 2019-08-03 stsp if (blob_staged)
8573 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8574 f69721c3 2019-10-21 stsp free(id_str);
8575 f69721c3 2019-10-21 stsp free(label_orig);
8576 ad493afc 2019-08-03 stsp return err;
8579 ad493afc 2019-08-03 stsp const struct got_error *
8580 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8581 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8582 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8583 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8584 ad493afc 2019-08-03 stsp struct got_repository *repo)
8586 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8587 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8588 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8589 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8590 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8592 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8594 ad493afc 2019-08-03 stsp return err;
8596 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8598 ad493afc 2019-08-03 stsp goto done;
8600 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8601 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8602 ad493afc 2019-08-03 stsp upa.repo = repo;
8603 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8604 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8605 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8606 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8607 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8608 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8609 62da3196 2021-10-01 stsp unstage_path, &upa, NULL, NULL, 1, 0);
8611 ad493afc 2019-08-03 stsp goto done;
8614 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8615 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8616 ad493afc 2019-08-03 stsp err = sync_err;
8618 ad493afc 2019-08-03 stsp free(fileindex_path);
8619 ad493afc 2019-08-03 stsp if (fileindex)
8620 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8621 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8622 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8623 ad493afc 2019-08-03 stsp err = unlockerr;
8624 ad493afc 2019-08-03 stsp return err;
8627 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8628 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8629 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8630 b2118c49 2020-07-28 stsp void *info_arg;
8631 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8632 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8633 b2118c49 2020-07-28 stsp void *cancel_arg;
8636 b2118c49 2020-07-28 stsp static const struct got_error *
8637 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8639 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8640 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8641 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8642 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8643 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8644 b2118c49 2020-07-28 stsp int stage;
8646 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8647 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8649 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8650 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8651 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8654 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8655 b2118c49 2020-07-28 stsp return NULL;
8657 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8658 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8659 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8661 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8662 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8663 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8664 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8665 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8666 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8669 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8670 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8671 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8674 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8675 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8678 b2118c49 2020-07-28 stsp const struct got_error *
8679 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8680 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8681 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8682 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8685 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8686 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8687 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8688 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8690 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8692 b2118c49 2020-07-28 stsp return err;
8694 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8696 b2118c49 2020-07-28 stsp goto done;
8698 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8699 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8700 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8701 b2118c49 2020-07-28 stsp arg.paths = paths;
8702 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8703 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8704 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8707 b2118c49 2020-07-28 stsp free(fileindex_path);
8708 b2118c49 2020-07-28 stsp if (fileindex)
8709 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8710 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8711 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8712 b2118c49 2020-07-28 stsp err = unlockerr;
8713 b2118c49 2020-07-28 stsp return err;
8716 78f5ac24 2022-03-19 op static const struct got_error *
8717 78f5ac24 2022-03-19 op patch_check_path(const char *p, char **path, unsigned char *status,
8718 78f5ac24 2022-03-19 op unsigned char *staged_status, struct got_fileindex *fileindex,
8719 78f5ac24 2022-03-19 op struct got_worktree *worktree, struct got_repository *repo)
8721 78f5ac24 2022-03-19 op const struct got_error *err;
8722 78f5ac24 2022-03-19 op struct got_fileindex_entry *ie;
8723 78f5ac24 2022-03-19 op struct stat sb;
8724 78f5ac24 2022-03-19 op char *ondisk_path = NULL;
8726 78f5ac24 2022-03-19 op err = got_worktree_resolve_path(path, worktree, p);
8730 78f5ac24 2022-03-19 op if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
8731 78f5ac24 2022-03-19 op *path[0] ? "/" : "", *path) == -1)
8732 78f5ac24 2022-03-19 op return got_error_from_errno("asprintf");
8734 78f5ac24 2022-03-19 op ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
8736 78f5ac24 2022-03-19 op *staged_status = get_staged_status(ie);
8737 78f5ac24 2022-03-19 op err = get_file_status(status, &sb, ie, *path, -1, NULL, repo);
8741 78f5ac24 2022-03-19 op *staged_status = GOT_STATUS_NO_CHANGE;
8742 78f5ac24 2022-03-19 op *status = GOT_STATUS_UNVERSIONED;
8743 78f5ac24 2022-03-19 op if (lstat(ondisk_path, &sb) == -1) {
8744 78f5ac24 2022-03-19 op if (errno != ENOENT) {
8745 78f5ac24 2022-03-19 op err = got_error_from_errno2("lstat",
8746 78f5ac24 2022-03-19 op ondisk_path);
8749 78f5ac24 2022-03-19 op *status = GOT_STATUS_NONEXISTENT;
8754 78f5ac24 2022-03-19 op free(ondisk_path);
8758 78f5ac24 2022-03-19 op static const struct got_error *
8759 78f5ac24 2022-03-19 op patch_can_rm(const char *path, unsigned char status,
8760 78f5ac24 2022-03-19 op unsigned char staged_status)
8762 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
8763 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
8764 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
8765 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
8766 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY &&
8767 78f5ac24 2022-03-19 op status != GOT_STATUS_MODE_CHANGE)
8768 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
8769 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
8770 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
8771 78f5ac24 2022-03-19 op return NULL;
8774 78f5ac24 2022-03-19 op static const struct got_error *
8775 78f5ac24 2022-03-19 op patch_can_add(const char *path, unsigned char status)
8777 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NONEXISTENT)
8778 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
8779 78f5ac24 2022-03-19 op return NULL;
8782 78f5ac24 2022-03-19 op static const struct got_error *
8783 78f5ac24 2022-03-19 op patch_can_edit(const char *path, unsigned char status,
8784 78f5ac24 2022-03-19 op unsigned char staged_status)
8786 78f5ac24 2022-03-19 op if (status == GOT_STATUS_NONEXISTENT)
8787 78f5ac24 2022-03-19 op return got_error_set_errno(ENOENT, path);
8788 78f5ac24 2022-03-19 op if (status != GOT_STATUS_NO_CHANGE &&
8789 78f5ac24 2022-03-19 op status != GOT_STATUS_ADD &&
8790 78f5ac24 2022-03-19 op status != GOT_STATUS_MODIFY)
8791 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
8792 78f5ac24 2022-03-19 op if (staged_status == GOT_STATUS_DELETE)
8793 78f5ac24 2022-03-19 op return got_error_path(path, GOT_ERR_FILE_STATUS);
8794 78f5ac24 2022-03-19 op return NULL;
8797 78f5ac24 2022-03-19 op const struct got_error *
8798 78f5ac24 2022-03-19 op got_worktree_patch_prepare(struct got_fileindex **fileindex,
8799 78f5ac24 2022-03-19 op struct got_worktree *worktree)
8801 78f5ac24 2022-03-19 op const struct got_error *err;
8802 78f5ac24 2022-03-19 op char *fileindex_path = NULL;
8804 78f5ac24 2022-03-19 op err = open_fileindex(fileindex, &fileindex_path, worktree);
8805 78f5ac24 2022-03-19 op free(fileindex_path);
8809 78f5ac24 2022-03-19 op const struct got_error *
8810 78f5ac24 2022-03-19 op got_worktree_patch_check_path(const char *old, const char *new,
8811 78f5ac24 2022-03-19 op char **oldpath, char **newpath, struct got_worktree *worktree,
8812 78f5ac24 2022-03-19 op struct got_repository *repo, struct got_fileindex *fileindex)
8814 78f5ac24 2022-03-19 op const struct got_error *err = NULL;
8815 78f5ac24 2022-03-19 op int file_renamed = 0;
8816 78f5ac24 2022-03-19 op unsigned char status_old, staged_status_old;
8817 78f5ac24 2022-03-19 op unsigned char status_new, staged_status_new;
8819 78f5ac24 2022-03-19 op *oldpath = NULL;
8820 78f5ac24 2022-03-19 op *newpath = NULL;
8822 78f5ac24 2022-03-19 op err = patch_check_path(old != NULL ? old : new, oldpath,
8823 78f5ac24 2022-03-19 op &status_old, &staged_status_old, fileindex, worktree, repo);
8827 78f5ac24 2022-03-19 op err = patch_check_path(new != NULL ? new : old, newpath,
8828 78f5ac24 2022-03-19 op &status_new, &staged_status_new, fileindex, worktree, repo);
8832 78f5ac24 2022-03-19 op if (old != NULL && new != NULL && strcmp(old, new) != 0)
8833 78f5ac24 2022-03-19 op file_renamed = 1;
8835 78f5ac24 2022-03-19 op if (old != NULL && new == NULL)
8836 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
8837 78f5ac24 2022-03-19 op else if (file_renamed) {
8838 78f5ac24 2022-03-19 op err = patch_can_rm(*oldpath, status_old, staged_status_old);
8839 78f5ac24 2022-03-19 op if (err == NULL)
8840 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
8841 78f5ac24 2022-03-19 op } else if (old == NULL)
8842 78f5ac24 2022-03-19 op err = patch_can_add(*newpath, status_new);
8844 78f5ac24 2022-03-19 op err = patch_can_edit(*newpath, status_new, staged_status_new);
8848 78f5ac24 2022-03-19 op free(*oldpath);
8849 78f5ac24 2022-03-19 op *oldpath = NULL;
8850 78f5ac24 2022-03-19 op free(*newpath);
8851 78f5ac24 2022-03-19 op *newpath = NULL;
8856 78f5ac24 2022-03-19 op const struct got_error *
8857 78f5ac24 2022-03-19 op got_worktree_patch_complete(struct got_fileindex *fileindex)
8859 78f5ac24 2022-03-19 op got_fileindex_free(fileindex);
8860 78f5ac24 2022-03-19 op return NULL;
