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"
60 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
66 99724ed4 2018-03-10 stsp static const struct got_error *
67 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
69 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
72 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
73 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
75 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
80 507dc3bb 2018-12-29 stsp static const struct got_error *
81 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
83 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
84 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
85 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
86 507dc3bb 2018-12-29 stsp char *path = NULL;
88 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
89 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
90 507dc3bb 2018-12-29 stsp path = NULL;
94 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
98 507dc3bb 2018-12-29 stsp if (content) {
99 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
100 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
101 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
106 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
107 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
108 2a57020b 2019-02-20 stsp unlink(tmppath);
113 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
114 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
115 230a42bd 2019-05-11 jcs free(tmppath);
116 99724ed4 2018-03-10 stsp return err;
119 09fe317a 2018-03-11 stsp static const struct got_error *
120 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
122 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
123 09fe317a 2018-03-11 stsp char *path;
124 09fe317a 2018-03-11 stsp int fd = -1;
126 09fe317a 2018-03-11 stsp struct stat sb;
128 09fe317a 2018-03-11 stsp *content = NULL;
130 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
131 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
132 09fe317a 2018-03-11 stsp path = NULL;
136 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
137 09fe317a 2018-03-11 stsp if (fd == -1) {
138 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
139 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
141 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
144 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
145 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
146 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
150 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
151 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
154 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
155 09fe317a 2018-03-11 stsp if (*content == NULL) {
156 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
160 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
161 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
162 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
163 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
166 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
167 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
170 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
173 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
174 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
175 09fe317a 2018-03-11 stsp free(path);
177 09fe317a 2018-03-11 stsp free(*content);
178 09fe317a 2018-03-11 stsp *content = NULL;
180 09fe317a 2018-03-11 stsp return err;
183 024e9686 2019-05-14 stsp static const struct got_error *
184 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
186 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
187 024e9686 2019-05-14 stsp char *refstr = NULL;
189 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
190 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
191 024e9686 2019-05-14 stsp if (refstr == NULL)
192 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
194 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
195 024e9686 2019-05-14 stsp if (refstr == NULL)
196 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
198 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
199 024e9686 2019-05-14 stsp free(refstr);
200 024e9686 2019-05-14 stsp return err;
203 86c3caaf 2018-03-09 stsp const struct got_error *
204 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
205 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
207 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
208 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
209 ec22038e 2019-03-10 stsp uuid_t uuid;
210 ec22038e 2019-03-10 stsp uint32_t uuid_status;
211 65596e15 2018-12-24 stsp int obj_type;
212 7ac97322 2018-03-11 stsp char *path_got = NULL;
213 1451e70d 2018-03-10 stsp char *formatstr = NULL;
214 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
215 65596e15 2018-12-24 stsp char *basestr = NULL;
216 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
218 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
219 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
223 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
225 65596e15 2018-12-24 stsp return err;
226 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
228 65596e15 2018-12-24 stsp return err;
229 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
230 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
232 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
233 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
234 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
237 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
238 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
239 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
243 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
244 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
245 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
248 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
249 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
253 056e7441 2018-03-11 stsp /* Create an empty lock file. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
258 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
259 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
263 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
264 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
268 65596e15 2018-12-24 stsp /* Record our base commit. */
269 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
272 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
276 1451e70d 2018-03-10 stsp /* Store path to repository. */
277 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
278 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
282 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
283 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
284 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
288 ec22038e 2019-03-10 stsp /* Generate UUID. */
289 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
294 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
295 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
296 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
299 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
303 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
304 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
305 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
308 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
313 65596e15 2018-12-24 stsp free(commit_id);
314 7ac97322 2018-03-11 stsp free(path_got);
315 1451e70d 2018-03-10 stsp free(formatstr);
316 0bb8a95e 2018-03-12 stsp free(absprefix);
317 65596e15 2018-12-24 stsp free(basestr);
318 ec22038e 2019-03-10 stsp free(uuidstr);
319 86c3caaf 2018-03-09 stsp return err;
322 247140b2 2019-02-05 stsp static const struct got_error *
323 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
325 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
326 7ac97322 2018-03-11 stsp char *path_got;
327 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
328 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
329 056e7441 2018-03-11 stsp char *path_lock = NULL;
330 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
331 6d9d28c3 2018-03-11 stsp int version, fd = -1;
332 6d9d28c3 2018-03-11 stsp const char *errstr;
333 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
334 c442a90d 2019-03-10 stsp uint32_t uuid_status;
336 6d9d28c3 2018-03-11 stsp *worktree = NULL;
338 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
339 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
340 7ac97322 2018-03-11 stsp path_got = NULL;
344 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
345 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
346 056e7441 2018-03-11 stsp path_lock = NULL;
350 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
351 6d9d28c3 2018-03-11 stsp if (fd == -1) {
352 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
353 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
357 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
361 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
362 6d9d28c3 2018-03-11 stsp if (errstr) {
363 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
364 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
367 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
368 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
372 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
373 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
374 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
377 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
379 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
380 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
381 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
384 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
385 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
389 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
390 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
394 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
395 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
399 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
402 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
403 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
404 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_from_string");
408 c9956ddf 2019-09-08 stsp err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
412 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
413 eaccb85f 2018-12-25 stsp base_commit_id_str);
417 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
418 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
421 eaccb85f 2018-12-25 stsp got_repo_close(repo);
422 7ac97322 2018-03-11 stsp free(path_got);
423 056e7441 2018-03-11 stsp free(path_lock);
424 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
425 c442a90d 2019-03-10 stsp free(uuidstr);
426 bd165944 2019-03-10 stsp free(formatstr);
428 6d9d28c3 2018-03-11 stsp if (fd != -1)
430 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
431 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
432 6d9d28c3 2018-03-11 stsp *worktree = NULL;
434 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
436 6d9d28c3 2018-03-11 stsp return err;
439 247140b2 2019-02-05 stsp const struct got_error *
440 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
442 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
445 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
446 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
447 247140b2 2019-02-05 stsp return err;
448 247140b2 2019-02-05 stsp if (*worktree)
449 247140b2 2019-02-05 stsp return NULL;
450 247140b2 2019-02-05 stsp path = dirname(path);
451 d1542a27 2019-02-05 stsp if (path == NULL)
452 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
453 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
455 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
458 3a6ce05a 2019-02-11 stsp const struct got_error *
459 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
461 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
462 cde76477 2018-03-11 stsp free(worktree->repo_path);
463 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
464 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
465 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
466 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
467 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
468 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
469 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
470 7f11502c 2019-08-28 hiltjo free(worktree->root_path);
471 6d9d28c3 2018-03-11 stsp free(worktree);
472 3a6ce05a 2019-02-11 stsp return err;
475 2fbdb5ae 2018-12-29 stsp const char *
476 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
478 c7f4312f 2019-02-05 stsp return worktree->root_path;
481 c7f4312f 2019-02-05 stsp const char *
482 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
484 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
487 49520a32 2018-12-29 stsp const char *
488 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
490 f609be2e 2018-12-29 stsp return worktree->path_prefix;
493 e5dc7198 2018-12-29 stsp const struct got_error *
494 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
495 e5dc7198 2018-12-29 stsp const char *path_prefix)
497 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
499 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
500 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
501 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
503 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
504 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
505 e5dc7198 2018-12-29 stsp free(absprefix);
506 e5dc7198 2018-12-29 stsp return NULL;
509 bc70eb79 2019-05-09 stsp const char *
510 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
512 36a38700 2019-05-10 stsp return worktree->head_ref_name;
515 024e9686 2019-05-14 stsp const struct got_error *
516 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
517 024e9686 2019-05-14 stsp struct got_reference *head_ref)
519 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
520 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
522 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
523 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
524 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
525 024e9686 2019-05-14 stsp path_got = NULL;
529 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
530 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
531 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
535 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
539 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
540 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
542 024e9686 2019-05-14 stsp free(path_got);
544 024e9686 2019-05-14 stsp free(head_ref_name);
545 024e9686 2019-05-14 stsp return err;
548 b72f483a 2019-02-05 stsp struct got_object_id *
549 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
551 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
554 507dc3bb 2018-12-29 stsp const struct got_error *
555 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
556 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
558 507dc3bb 2018-12-29 stsp const struct got_error *err;
559 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
560 507dc3bb 2018-12-29 stsp char *id_str = NULL;
561 507dc3bb 2018-12-29 stsp char *path_got = NULL;
563 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
564 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
565 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
566 507dc3bb 2018-12-29 stsp path_got = NULL;
570 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
572 507dc3bb 2018-12-29 stsp return err;
574 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
575 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
579 507dc3bb 2018-12-29 stsp /* Record our base commit. */
580 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
583 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
587 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
588 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
589 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
590 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
595 507dc3bb 2018-12-29 stsp got_object_close(obj);
596 507dc3bb 2018-12-29 stsp free(id_str);
597 507dc3bb 2018-12-29 stsp free(path_got);
598 507dc3bb 2018-12-29 stsp return err;
601 9d31a1d8 2018-03-11 stsp static const struct got_error *
602 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
604 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
605 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
606 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
607 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
608 86c3caaf 2018-03-09 stsp return NULL;
611 21908da4 2019-01-13 stsp static const struct got_error *
612 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
614 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
615 4a1ddfc2 2019-01-12 stsp char *abspath;
617 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
618 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
620 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
621 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
622 ddcd8544 2019-03-11 stsp struct stat sb;
623 ddcd8544 2019-03-11 stsp err = NULL;
624 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
625 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
626 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
627 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
628 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
631 4a1ddfc2 2019-01-12 stsp free(abspath);
632 68c76935 2019-02-19 stsp return err;
635 68c76935 2019-02-19 stsp static const struct got_error *
636 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
638 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
639 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
640 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
641 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
646 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
647 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
648 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
651 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
652 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
653 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
656 68c76935 2019-02-19 stsp if (flen1 == 0) {
657 68c76935 2019-02-19 stsp if (flen2 != 0)
660 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
661 68c76935 2019-02-19 stsp if (flen1 != 0)
664 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
665 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
675 68c76935 2019-02-19 stsp return err;
678 68c76935 2019-02-19 stsp static const struct got_error *
679 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
681 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
682 68c76935 2019-02-19 stsp struct stat sb;
683 68c76935 2019-02-19 stsp size_t size1, size2;
684 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
688 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
692 68c76935 2019-02-19 stsp size1 = sb.st_size;
694 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
695 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
698 68c76935 2019-02-19 stsp size2 = sb.st_size;
700 68c76935 2019-02-19 stsp if (size1 != size2) {
702 68c76935 2019-02-19 stsp return NULL;
705 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
706 68c76935 2019-02-19 stsp if (f1 == NULL)
707 60522982 2019-12-15 stsp return got_error_from_errno2("fopen", f1_path);
709 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
710 68c76935 2019-02-19 stsp if (f2 == NULL) {
711 60522982 2019-12-15 stsp err = got_error_from_errno2("fopen", f2_path);
715 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
717 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
718 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
719 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
720 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
722 6353ad76 2019-02-08 stsp return err;
726 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
727 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
728 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
730 6353ad76 2019-02-08 stsp static const struct got_error *
731 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
732 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
733 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
734 f69721c3 2019-10-21 stsp const char *label_orig, const char *label_deriv,
735 f69721c3 2019-10-21 stsp struct got_repository *repo,
736 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
738 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
739 6353ad76 2019-02-08 stsp int merged_fd = -1;
740 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
741 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
742 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
743 234035bc 2019-06-01 stsp int overlapcnt = 0;
744 af54ae4a 2019-02-19 stsp char *parent;
746 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
748 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
749 af54ae4a 2019-02-19 stsp if (parent == NULL)
750 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
752 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
753 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
755 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
759 af54ae4a 2019-02-19 stsp free(base_path);
760 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
761 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
762 af54ae4a 2019-02-19 stsp base_path = NULL;
766 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
769 46b6ee73 2019-06-04 stsp if (blob_orig) {
770 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
771 46b6ee73 2019-06-04 stsp blob_orig);
776 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
777 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
778 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
782 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
783 f69721c3 2019-10-21 stsp blob_orig_path, ondisk_path, label_deriv, label_orig, NULL);
787 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
788 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
792 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
793 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
797 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
798 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
799 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
800 68c76935 2019-02-19 stsp merged_path);
805 2ad902c0 2019-12-15 stsp if (fchmod(merged_fd, st_mode) != 0) {
806 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
810 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
811 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
812 230a42bd 2019-05-11 jcs ondisk_path);
817 fdcb7daf 2019-12-15 stsp if (merged_path)
818 fdcb7daf 2019-12-15 stsp unlink(merged_path);
820 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
821 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
822 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
823 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
824 6353ad76 2019-02-08 stsp free(merged_path);
825 af54ae4a 2019-02-19 stsp free(base_path);
826 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
827 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
828 46b6ee73 2019-06-04 stsp free(blob_orig_path);
830 14c901f1 2019-08-08 stsp return err;
834 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
835 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
836 14c901f1 2019-08-08 stsp * acts as the second derived version.
838 14c901f1 2019-08-08 stsp static const struct got_error *
839 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
840 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
841 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
842 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
843 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
844 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
846 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
847 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
848 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
849 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
851 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
853 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
854 14c901f1 2019-08-08 stsp if (parent == NULL)
855 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
857 14c901f1 2019-08-08 stsp free(base_path);
858 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
859 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
860 14c901f1 2019-08-08 stsp base_path = NULL;
864 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
867 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
868 14c901f1 2019-08-08 stsp blob_deriv);
872 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
875 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
876 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
877 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
881 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
882 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
883 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
885 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
886 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
887 14c901f1 2019-08-08 stsp free(base_path);
888 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
889 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
890 14c901f1 2019-08-08 stsp free(blob_deriv_path);
892 6353ad76 2019-02-08 stsp free(id_str);
893 818c7501 2019-07-11 stsp free(label_deriv);
894 4a1ddfc2 2019-01-12 stsp return err;
897 4a1ddfc2 2019-01-12 stsp static const struct got_error *
898 054041d0 2020-06-24 stsp create_fileindex_entry(struct got_fileindex *fileindex,
899 054041d0 2020-06-24 stsp struct got_object_id *base_commit_id, const char *ondisk_path,
900 054041d0 2020-06-24 stsp const char *path, struct got_object_id *blob_id)
902 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
903 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
905 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
907 054041d0 2020-06-24 stsp return err;
909 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(new_ie, ondisk_path,
910 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
914 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
917 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
918 13d9040b 2019-03-27 stsp return err;
921 1ebedb77 2019-10-19 stsp static mode_t
922 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
924 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
926 1ebedb77 2019-10-19 stsp if (executable) {
927 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
928 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
929 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
930 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
931 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
932 1ebedb77 2019-10-19 stsp return st_mode | xbits;
935 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
938 8ba819a3 2020-07-23 stsp /* forward declaration */
939 13d9040b 2019-03-27 stsp static const struct got_error *
940 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
941 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
942 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
943 4b55f459 2019-09-08 stsp int reverting_versioned_file, struct got_repository *repo,
944 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
946 8ba819a3 2020-07-23 stsp static const struct got_error *
947 8ba819a3 2020-07-23 stsp install_symlink(struct got_worktree *worktree, const char *ondisk_path,
948 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
949 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
950 8ba819a3 2020-07-23 stsp int reverting_versioned_file, struct got_repository *repo,
951 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
953 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
954 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
955 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
956 8ba819a3 2020-07-23 stsp char *resolved_path = NULL, *abspath = NULL;
957 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
958 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
961 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
962 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
963 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
964 8ba819a3 2020-07-23 stsp * in the blob object.
967 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
968 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
969 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
970 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
971 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
972 8ba819a3 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, st_mode, blob,
973 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
974 8ba819a3 2020-07-23 stsp repo, progress_cb, progress_arg);
976 8ba819a3 2020-07-23 stsp if (len > 0) {
977 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
978 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
979 8ba819a3 2020-07-23 stsp len - hdrlen);
980 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
981 8ba819a3 2020-07-23 stsp hdrlen = 0;
983 8ba819a3 2020-07-23 stsp } while (len != 0);
984 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
987 8ba819a3 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
988 8ba819a3 2020-07-23 stsp * in which the blob object is being installed.
990 8ba819a3 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
991 8ba819a3 2020-07-23 stsp char *parent = dirname(ondisk_path);
992 8ba819a3 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
993 8ba819a3 2020-07-23 stsp err = got_error_from_errno("asprintf");
999 8ba819a3 2020-07-23 stsp * unveil(2) restricts our view of paths in the filesystem.
1000 8ba819a3 2020-07-23 stsp * ENOENT will occur if a link target path does not exist or
1001 8ba819a3 2020-07-23 stsp * if it points outside our unveiled path space.
1003 8ba819a3 2020-07-23 stsp resolved_path = realpath(abspath ? abspath : target_path, NULL);
1004 8ba819a3 2020-07-23 stsp if (resolved_path == NULL) {
1005 8ba819a3 2020-07-23 stsp if (errno != ENOENT)
1006 8ba819a3 2020-07-23 stsp return got_error_from_errno2("realpath", target_path);
1009 8ba819a3 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1010 0ab20ee9 2020-07-23 stsp if (!got_path_is_child(resolved_path ? resolved_path : (abspath ?
1011 0ab20ee9 2020-07-23 stsp abspath : target_path), worktree->root_path,
1012 0ab20ee9 2020-07-23 stsp strlen(worktree->root_path))) {
1013 8ba819a3 2020-07-23 stsp /* install as a regular file */
1014 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1015 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1016 8ba819a3 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, st_mode, blob,
1017 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1018 8ba819a3 2020-07-23 stsp repo, progress_cb, progress_arg);
1019 8ba819a3 2020-07-23 stsp goto done;
1022 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1023 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1024 8ba819a3 2020-07-23 stsp struct stat sb;
1025 8ba819a3 2020-07-23 stsp ssize_t elen;
1026 8ba819a3 2020-07-23 stsp char etarget[PATH_MAX];
1027 8ba819a3 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
1028 8ba819a3 2020-07-23 stsp err = got_error_from_errno2("lstat",
1029 8ba819a3 2020-07-23 stsp ondisk_path);
1030 8ba819a3 2020-07-23 stsp goto done;
1032 8ba819a3 2020-07-23 stsp if (!S_ISLNK(sb.st_mode)) {
1033 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1034 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1035 8ba819a3 2020-07-23 stsp goto done;
1037 8ba819a3 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1038 8ba819a3 2020-07-23 stsp if (elen == -1) {
1039 8ba819a3 2020-07-23 stsp err = got_error_from_errno2("readlink",
1040 8ba819a3 2020-07-23 stsp ondisk_path);
1041 8ba819a3 2020-07-23 stsp goto done;
1043 8ba819a3 2020-07-23 stsp if (elen == target_len &&
1044 f35fa46a 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0) {
1045 f35fa46a 2020-07-23 stsp err = NULL; /* nothing to do */
1046 f35fa46a 2020-07-23 stsp goto done;
1048 f35fa46a 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
1049 f35fa46a 2020-07-23 stsp err = got_error_from_errno2("unlink",
1050 f35fa46a 2020-07-23 stsp ondisk_path);
1051 f35fa46a 2020-07-23 stsp goto done;
1053 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1054 f35fa46a 2020-07-23 stsp err = got_error_from_errno3("symlink",
1055 f35fa46a 2020-07-23 stsp target_path, ondisk_path);
1056 f35fa46a 2020-07-23 stsp goto done;
1059 f35fa46a 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1060 f35fa46a 2020-07-23 stsp GOT_STATUS_UPDATE, path);
1061 f35fa46a 2020-07-23 stsp goto done;
1065 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1066 f35fa46a 2020-07-23 stsp char *parent = dirname(ondisk_path);
1067 f35fa46a 2020-07-23 stsp if (parent == NULL) {
1068 f35fa46a 2020-07-23 stsp err = got_error_from_errno2("dirname",
1069 f35fa46a 2020-07-23 stsp ondisk_path);
1070 f35fa46a 2020-07-23 stsp goto done;
1072 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1074 f35fa46a 2020-07-23 stsp goto done;
1076 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1077 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1079 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1080 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1081 f35fa46a 2020-07-23 stsp goto done;
1085 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1086 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1087 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1088 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1089 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1090 8ba819a3 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, st_mode, blob,
1091 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1092 8ba819a3 2020-07-23 stsp repo, progress_cb, progress_arg);
1093 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1094 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1095 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1097 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1098 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1101 f35fa46a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_ADD, path);
1103 8ba819a3 2020-07-23 stsp free(resolved_path);
1104 8ba819a3 2020-07-23 stsp free(abspath);
1105 8ba819a3 2020-07-23 stsp return err;
1108 8ba819a3 2020-07-23 stsp static const struct got_error *
1109 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1110 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1111 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1112 8ba819a3 2020-07-23 stsp int reverting_versioned_file, struct got_repository *repo,
1113 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1115 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1116 507dc3bb 2018-12-29 stsp int fd = -1;
1117 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1118 507dc3bb 2018-12-29 stsp int update = 0;
1119 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1121 8ba819a3 2020-07-23 stsp if (S_ISLNK(te_mode))
1122 8ba819a3 2020-07-23 stsp return install_symlink(worktree, ondisk_path, path, te_mode,
1123 8ba819a3 2020-07-23 stsp st_mode, blob, restoring_missing_file,
1124 8ba819a3 2020-07-23 stsp reverting_versioned_file, repo, progress_cb, progress_arg);
1126 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1127 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1128 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1129 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1130 21908da4 2019-01-13 stsp char *parent = dirname(path);
1131 21908da4 2019-01-13 stsp if (parent == NULL)
1132 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
1133 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1135 21908da4 2019-01-13 stsp return err;
1136 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1137 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1138 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1139 21908da4 2019-01-13 stsp if (fd == -1)
1140 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1141 230a42bd 2019-05-11 jcs ondisk_path);
1142 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1143 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
1144 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1145 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1146 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1147 507dc3bb 2018-12-29 stsp goto done;
1149 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1150 507dc3bb 2018-12-29 stsp ondisk_path);
1152 507dc3bb 2018-12-29 stsp goto done;
1153 507dc3bb 2018-12-29 stsp update = 1;
1156 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1159 a378724f 2019-02-10 stsp if (restoring_missing_file)
1160 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
1161 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
1162 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
1164 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
1165 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1167 1ee397ad 2019-07-12 stsp goto done;
1169 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1171 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1172 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1175 9d31a1d8 2018-03-11 stsp if (len > 0) {
1176 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1177 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1178 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1179 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1180 b87c6f83 2018-12-24 stsp goto done;
1181 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1182 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1183 b87c6f83 2018-12-24 stsp goto done;
1185 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1187 9d31a1d8 2018-03-11 stsp } while (len != 0);
1189 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1190 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1191 816dc654 2019-02-16 stsp goto done;
1194 507dc3bb 2018-12-29 stsp if (update) {
1195 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1196 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1197 230a42bd 2019-05-11 jcs ondisk_path);
1198 2a57020b 2019-02-20 stsp unlink(tmppath);
1199 68ed9ba5 2019-02-10 stsp goto done;
1203 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1204 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1205 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1206 1ebedb77 2019-10-19 stsp goto done;
1210 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1211 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1212 507dc3bb 2018-12-29 stsp free(tmppath);
1213 6353ad76 2019-02-08 stsp return err;
1216 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1217 6353ad76 2019-02-08 stsp static const struct got_error *
1218 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1220 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1221 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1222 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1223 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1224 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1226 7154f6ce 2019-03-27 stsp int i = 0;
1227 7154f6ce 2019-03-27 stsp char *line;
1228 7154f6ce 2019-03-27 stsp size_t len;
1229 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1231 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1232 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1233 7154f6ce 2019-03-27 stsp if (line == NULL) {
1234 7154f6ce 2019-03-27 stsp if (feof(f))
1236 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1240 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1241 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1243 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1249 7154f6ce 2019-03-27 stsp return err;
1252 e2b1e152 2019-07-13 stsp static int
1253 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1255 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1256 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1259 1ebedb77 2019-10-19 stsp static int
1260 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1262 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1263 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1264 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1265 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1266 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1267 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1270 c363b2c1 2019-08-03 stsp static unsigned char
1271 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1273 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1274 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1275 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1276 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1277 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1278 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1279 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1281 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1285 7154f6ce 2019-03-27 stsp static const struct got_error *
1286 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1287 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1288 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1290 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1291 6353ad76 2019-02-08 stsp struct got_object_id id;
1292 6353ad76 2019-02-08 stsp size_t hdrlen;
1293 1338848f 2019-12-13 stsp int fd = -1;
1294 6353ad76 2019-02-08 stsp FILE *f = NULL;
1295 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1296 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1297 6353ad76 2019-02-08 stsp size_t flen, blen;
1298 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1300 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1303 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1304 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1305 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1307 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1308 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1309 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1310 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1311 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1313 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1314 882ef1b9 2019-12-13 stsp goto done;
1316 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1317 3d35a492 2019-12-13 stsp goto done;
1320 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1321 7f91a133 2019-12-13 stsp if (fd == -1 && errno != ENOENT)
1322 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1323 3d35a492 2019-12-13 stsp if (fd == -1 || fstat(fd, sb) == -1) {
1324 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1325 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1326 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1328 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1329 3d35a492 2019-12-13 stsp goto done;
1331 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1332 1338848f 2019-12-13 stsp goto done;
1336 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1337 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1338 1338848f 2019-12-13 stsp goto done;
1341 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1342 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1343 1338848f 2019-12-13 stsp goto done;
1344 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1345 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1346 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1347 1338848f 2019-12-13 stsp goto done;
1350 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1351 1338848f 2019-12-13 stsp goto done;
1353 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1354 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1355 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1357 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1359 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1361 1338848f 2019-12-13 stsp goto done;
1363 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1364 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1365 ab0d4361 2019-12-13 stsp if (fd == -1) {
1366 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1367 ab0d4361 2019-12-13 stsp goto done;
1371 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1372 6353ad76 2019-02-08 stsp if (f == NULL) {
1373 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1374 6353ad76 2019-02-08 stsp goto done;
1377 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1379 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1380 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1382 7154f6ce 2019-03-27 stsp goto done;
1383 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1384 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1385 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1386 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1387 7154f6ce 2019-03-27 stsp goto done;
1389 6353ad76 2019-02-08 stsp if (blen == 0) {
1390 6353ad76 2019-02-08 stsp if (flen != 0)
1391 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1393 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1394 6353ad76 2019-02-08 stsp if (blen != 0)
1395 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1397 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1398 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1399 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1400 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1404 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1407 6353ad76 2019-02-08 stsp hdrlen = 0;
1410 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1411 7154f6ce 2019-03-27 stsp rewind(f);
1412 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1413 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1414 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1417 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1418 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1419 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1420 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1421 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1422 9d31a1d8 2018-03-11 stsp return err;
1426 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1427 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1429 e2b1e152 2019-07-13 stsp static const struct got_error *
1430 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1431 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1433 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1434 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1435 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1437 e2b1e152 2019-07-13 stsp return NULL;
1440 9d31a1d8 2018-03-11 stsp static const struct got_error *
1441 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1442 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1443 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1444 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1445 0584f854 2019-04-06 stsp void *progress_arg)
1447 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1448 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1449 6353ad76 2019-02-08 stsp char *ondisk_path;
1450 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1451 b8f41171 2019-02-10 stsp struct stat sb;
1453 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1454 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1457 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1458 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1459 a76c42e6 2019-08-03 stsp goto done;
1461 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1464 abb4604f 2019-07-27 stsp goto done;
1465 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1466 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1468 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1470 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1471 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1472 b8f41171 2019-02-10 stsp goto done;
1474 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1475 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1477 5036ab18 2020-04-18 stsp goto done;
1480 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1481 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1482 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1483 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1484 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1485 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1487 e2b1e152 2019-07-13 stsp goto done;
1488 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1490 6353ad76 2019-02-08 stsp goto done;
1492 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1493 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1494 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1495 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1496 b8f41171 2019-02-10 stsp goto done;
1500 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1502 6353ad76 2019-02-08 stsp goto done;
1504 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1505 234035bc 2019-06-01 stsp int update_timestamps;
1506 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1507 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1508 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1509 234035bc 2019-06-01 stsp struct got_object_id id2;
1510 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1511 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1513 f69721c3 2019-10-21 stsp goto done;
1515 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1516 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1517 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1518 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1519 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1520 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1521 f69721c3 2019-10-21 stsp goto done;
1523 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1524 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1525 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1526 234035bc 2019-06-01 stsp goto done;
1529 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1530 f69721c3 2019-10-21 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1531 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1532 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1533 f69721c3 2019-10-21 stsp free(label_orig);
1534 234035bc 2019-06-01 stsp if (blob2)
1535 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1537 909d120e 2019-09-22 stsp goto done;
1539 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1540 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1541 234035bc 2019-06-01 stsp * unmodified files again.
1543 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1544 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1545 234035bc 2019-06-01 stsp update_timestamps);
1546 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1547 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1548 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1549 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1550 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1552 1ee397ad 2019-07-12 stsp goto done;
1553 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1554 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1556 13d9040b 2019-03-27 stsp goto done;
1558 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1559 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1560 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1562 13d9040b 2019-03-27 stsp goto done;
1564 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1565 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
1567 054041d0 2020-06-24 stsp err = create_fileindex_entry(fileindex,
1568 054041d0 2020-06-24 stsp worktree->base_commit_id, ondisk_path, path,
1569 054041d0 2020-06-24 stsp &blob->id);
1572 13d9040b 2019-03-27 stsp goto done;
1574 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1576 6353ad76 2019-02-08 stsp free(ondisk_path);
1577 8da9e5f4 2019-01-12 stsp return err;
1580 90285c3b 2019-01-08 stsp static const struct got_error *
1581 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1583 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1584 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1586 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1587 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1589 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1590 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1591 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1593 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1594 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1595 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1596 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1597 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1601 90285c3b 2019-01-08 stsp parent = dirname(parent);
1604 90285c3b 2019-01-08 stsp free(ondisk_path);
1605 90285c3b 2019-01-08 stsp return err;
1608 708d8e67 2019-03-27 stsp static const struct got_error *
1609 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1610 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1611 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1613 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1614 708d8e67 2019-03-27 stsp unsigned char status;
1615 708d8e67 2019-03-27 stsp struct stat sb;
1616 708d8e67 2019-03-27 stsp char *ondisk_path;
1618 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1619 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1621 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1623 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1625 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
1627 5a58a424 2020-06-23 stsp goto done;
1629 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1630 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1631 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1633 5a58a424 2020-06-23 stsp goto done;
1635 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1636 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1638 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1641 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1643 5a58a424 2020-06-23 stsp goto done;
1644 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1645 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1647 5a58a424 2020-06-23 stsp goto done;
1649 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1652 5a58a424 2020-06-23 stsp free(ondisk_path);
1653 fc6346c4 2019-03-27 stsp return err;
1656 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1657 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1658 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1659 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1660 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1661 8da9e5f4 2019-01-12 stsp void *progress_arg;
1662 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1663 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1666 512f0d0e 2019-01-02 stsp static const struct got_error *
1667 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1668 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1670 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1672 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1673 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1675 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1676 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1679 8da9e5f4 2019-01-12 stsp static const struct got_error *
1680 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1682 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1684 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1685 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1687 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1688 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1691 9d31a1d8 2018-03-11 stsp static const struct got_error *
1692 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1694 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1695 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1696 8da9e5f4 2019-01-12 stsp char *path;
1698 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1699 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1701 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1702 63c5ca5d 2019-08-24 stsp return NULL;
1704 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1705 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1707 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1709 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1710 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1712 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1713 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1715 8da9e5f4 2019-01-12 stsp free(path);
1716 0cd1c46a 2019-03-11 stsp return err;
1719 818c7501 2019-07-11 stsp static const struct got_error *
1720 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1722 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1723 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1724 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1726 517bab73 2019-03-11 stsp *refname = NULL;
1728 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1729 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1730 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1732 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1734 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1735 0647c563 2019-03-11 stsp *refname = NULL;
1737 517bab73 2019-03-11 stsp free(uuidstr);
1738 517bab73 2019-03-11 stsp return err;
1741 818c7501 2019-07-11 stsp const struct got_error *
1742 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1744 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1747 818c7501 2019-07-11 stsp static const struct got_error *
1748 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1750 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1751 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1754 818c7501 2019-07-11 stsp static const struct got_error *
1755 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1757 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1760 818c7501 2019-07-11 stsp static const struct got_error *
1761 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1763 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1764 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1767 818c7501 2019-07-11 stsp static const struct got_error *
1768 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1770 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1771 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1774 0ebf8283 2019-07-24 stsp static const struct got_error *
1775 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1777 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1778 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1781 0ebf8283 2019-07-24 stsp static const struct got_error *
1782 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1784 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1785 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1788 0ebf8283 2019-07-24 stsp static const struct got_error *
1789 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1791 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1792 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1795 0ebf8283 2019-07-24 stsp static const struct got_error *
1796 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1798 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1799 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1802 0ebf8283 2019-07-24 stsp const struct got_error *
1803 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1804 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1806 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1807 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1808 0ebf8283 2019-07-24 stsp *path = NULL;
1809 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1811 0ebf8283 2019-07-24 stsp return NULL;
1815 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1816 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1818 517bab73 2019-03-11 stsp static const struct got_error *
1819 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1821 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1822 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1823 517bab73 2019-03-11 stsp char *refname;
1825 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1827 517bab73 2019-03-11 stsp return err;
1829 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1831 0cd1c46a 2019-03-11 stsp goto done;
1833 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1835 0cd1c46a 2019-03-11 stsp free(refname);
1837 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1838 3e3a69f1 2019-07-25 stsp return err;
1841 3e3a69f1 2019-07-25 stsp static const struct got_error *
1842 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1844 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1846 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1847 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1848 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1849 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1851 9d31a1d8 2018-03-11 stsp return err;
1855 ebf99748 2019-05-09 stsp static const struct got_error *
1856 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1857 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
1859 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1860 ebf99748 2019-05-09 stsp FILE *index = NULL;
1862 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1863 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1864 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1865 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1867 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1869 ebf99748 2019-05-09 stsp goto done;
1871 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1872 ebf99748 2019-05-09 stsp if (index == NULL) {
1873 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1874 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1876 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1877 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1878 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1881 ebf99748 2019-05-09 stsp if (err) {
1882 ebf99748 2019-05-09 stsp free(*fileindex_path);
1883 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1884 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1885 ebf99748 2019-05-09 stsp *fileindex = NULL;
1887 ebf99748 2019-05-09 stsp return err;
1890 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1891 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1892 c932eeeb 2019-05-22 stsp const char *path;
1893 c932eeeb 2019-05-22 stsp size_t path_len;
1894 c932eeeb 2019-05-22 stsp const char *entry_name;
1895 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1896 a484d721 2019-06-10 stsp void *progress_arg;
1899 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1900 c932eeeb 2019-05-22 stsp static const struct got_error *
1901 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1903 1ee397ad 2019-07-12 stsp const struct got_error *err;
1904 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1906 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1907 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1908 c932eeeb 2019-05-22 stsp return NULL;
1909 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1910 102ff934 2019-06-11 stsp return NULL;
1912 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1913 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1914 c932eeeb 2019-05-22 stsp return NULL;
1916 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1917 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1918 edd02c5e 2019-07-11 stsp ie->path);
1920 1ee397ad 2019-07-12 stsp return err;
1922 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1923 c932eeeb 2019-05-22 stsp return NULL;
1926 9c6338c4 2019-06-02 stsp static const struct got_error *
1927 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1929 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1930 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1931 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1932 867630bb 2020-01-17 stsp struct timespec timeout;
1934 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1935 9c6338c4 2019-06-02 stsp fileindex_path);
1937 9c6338c4 2019-06-02 stsp goto done;
1939 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1941 9c6338c4 2019-06-02 stsp goto done;
1943 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1944 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1945 9c6338c4 2019-06-02 stsp fileindex_path);
1946 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1950 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
1951 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
1952 867630bb 2020-01-17 stsp * was recorded in the file index.
1954 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
1955 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
1956 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
1958 9c6338c4 2019-06-02 stsp if (new_index)
1959 9c6338c4 2019-06-02 stsp fclose(new_index);
1960 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1961 9c6338c4 2019-06-02 stsp return err;
1964 6ced4176 2019-07-12 stsp static const struct got_error *
1965 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1966 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1967 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1969 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1970 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1971 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1972 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1974 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1975 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1976 6ced4176 2019-07-12 stsp *tree_id = NULL;
1978 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1979 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1980 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1981 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1982 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1983 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1984 6ced4176 2019-07-12 stsp goto done;
1986 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1987 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1989 6ced4176 2019-07-12 stsp goto done;
1990 6ced4176 2019-07-12 stsp return NULL;
1993 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1995 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1996 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1997 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1998 6ced4176 2019-07-12 stsp goto done;
2001 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2002 6ced4176 2019-07-12 stsp in_repo_path);
2004 6ced4176 2019-07-12 stsp goto done;
2006 6ced4176 2019-07-12 stsp free(in_repo_path);
2007 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2009 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2011 6ced4176 2019-07-12 stsp goto done;
2013 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2014 6ced4176 2019-07-12 stsp /* Check out a single file. */
2015 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2016 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2017 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2018 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2019 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2020 6ced4176 2019-07-12 stsp goto done;
2022 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2023 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2024 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2025 6ced4176 2019-07-12 stsp goto done;
2028 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2029 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2031 6ced4176 2019-07-12 stsp return err;
2032 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2033 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2034 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2035 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2036 6ced4176 2019-07-12 stsp goto done;
2039 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2040 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2042 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2043 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2044 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2045 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2046 6ced4176 2019-07-12 stsp goto done;
2048 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2049 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2050 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2051 6ced4176 2019-07-12 stsp goto done;
2056 6ced4176 2019-07-12 stsp free(in_repo_path);
2057 6ced4176 2019-07-12 stsp if (err) {
2058 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2059 6ced4176 2019-07-12 stsp free(*tree_relpath);
2060 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2061 6ced4176 2019-07-12 stsp free(*tree_id);
2062 6ced4176 2019-07-12 stsp *tree_id = NULL;
2064 07ed472d 2019-07-12 stsp return err;
2067 07ed472d 2019-07-12 stsp static const struct got_error *
2068 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2069 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2070 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2071 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2073 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2074 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2075 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2076 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2077 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2079 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2080 7f47418f 2019-12-20 stsp if (err) {
2081 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2082 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2083 7f47418f 2019-12-20 stsp goto done;
2084 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2085 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2087 7f47418f 2019-12-20 stsp return err;
2090 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2091 07ed472d 2019-07-12 stsp worktree->base_commit_id);
2093 07ed472d 2019-07-12 stsp goto done;
2095 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2097 07ed472d 2019-07-12 stsp goto done;
2099 07ed472d 2019-07-12 stsp if (entry_name &&
2100 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2101 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2102 07ed472d 2019-07-12 stsp goto done;
2105 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2106 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2107 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2108 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2109 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2110 07ed472d 2019-07-12 stsp arg.repo = repo;
2111 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2112 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2113 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2114 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2115 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2116 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2119 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2120 07ed472d 2019-07-12 stsp if (commit)
2121 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2122 6ced4176 2019-07-12 stsp return err;
2125 9d31a1d8 2018-03-11 stsp const struct got_error *
2126 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2127 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2128 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2129 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2131 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2132 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2133 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2134 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2135 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2136 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2137 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2138 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2139 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2140 f2ea84fa 2019-07-27 stsp int entry_type;
2141 f2ea84fa 2019-07-27 stsp char *relpath;
2142 f2ea84fa 2019-07-27 stsp char *entry_name;
2143 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2144 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2146 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2148 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2150 9d31a1d8 2018-03-11 stsp return err;
2152 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2153 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2154 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2155 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2156 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2157 f2ea84fa 2019-07-27 stsp goto done;
2160 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2161 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2162 f2ea84fa 2019-07-27 stsp if (err) {
2163 f2ea84fa 2019-07-27 stsp free(tpd);
2164 6ced4176 2019-07-12 stsp goto done;
2167 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2168 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2169 f2ea84fa 2019-07-27 stsp if (err) {
2170 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2171 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2172 f2ea84fa 2019-07-27 stsp free(tpd);
2173 f2ea84fa 2019-07-27 stsp goto done;
2176 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2178 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2182 51514078 2018-12-25 stsp * Read the file index.
2183 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2184 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2186 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2188 c4cdcb68 2019-04-03 stsp goto done;
2190 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2191 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2192 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2194 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2195 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2196 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2200 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2201 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2202 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2203 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2204 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2205 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2206 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2207 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2211 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2213 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2214 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2215 af12c6b9 2019-06-04 stsp err = sync_err;
2217 9c6338c4 2019-06-02 stsp free(fileindex_path);
2219 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2220 9d31a1d8 2018-03-11 stsp if (commit)
2221 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2222 5ade8233 2019-07-12 stsp if (fileindex)
2223 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2224 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2225 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2226 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2227 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2228 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2229 f2ea84fa 2019-07-27 stsp free(tpd);
2231 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2232 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2233 9d31a1d8 2018-03-11 stsp err = unlockerr;
2234 f8d1f275 2019-02-04 stsp return err;
2237 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2238 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2239 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2240 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2241 234035bc 2019-06-01 stsp void *progress_arg;
2242 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2243 234035bc 2019-06-01 stsp void *cancel_arg;
2244 f69721c3 2019-10-21 stsp const char *label_orig;
2245 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2248 234035bc 2019-06-01 stsp static const struct got_error *
2249 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2250 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2251 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2252 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2254 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2255 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2256 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2257 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2258 234035bc 2019-06-01 stsp struct stat sb;
2259 234035bc 2019-06-01 stsp unsigned char status;
2260 234035bc 2019-06-01 stsp int local_changes_subsumed;
2262 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2263 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2264 d6c87207 2019-08-02 stsp strlen(path2));
2265 1ee397ad 2019-07-12 stsp if (ie == NULL)
2266 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2267 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2269 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2270 234035bc 2019-06-01 stsp path2) == -1)
2271 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2273 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2276 234035bc 2019-06-01 stsp goto done;
2278 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2279 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2280 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2281 234035bc 2019-06-01 stsp goto done;
2283 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2284 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2285 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2286 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2287 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2288 234035bc 2019-06-01 stsp goto done;
2291 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2292 f69721c3 2019-10-21 stsp ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2293 f69721c3 2019-10-21 stsp a->commit_id2, repo, a->progress_cb, a->progress_arg);
2294 234035bc 2019-06-01 stsp } else if (blob1) {
2295 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2296 d6c87207 2019-08-02 stsp strlen(path1));
2297 1ee397ad 2019-07-12 stsp if (ie == NULL)
2298 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2299 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2301 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2302 2b92fad7 2019-06-02 stsp path1) == -1)
2303 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2305 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2308 2b92fad7 2019-06-02 stsp goto done;
2310 2b92fad7 2019-06-02 stsp switch (status) {
2311 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2312 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2313 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2315 1ee397ad 2019-07-12 stsp goto done;
2316 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2318 2b92fad7 2019-06-02 stsp goto done;
2320 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2322 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2323 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2324 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2325 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2327 1ee397ad 2019-07-12 stsp goto done;
2329 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2331 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2332 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2333 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2334 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2335 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2337 1ee397ad 2019-07-12 stsp goto done;
2339 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2340 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2342 1ee397ad 2019-07-12 stsp goto done;
2347 234035bc 2019-06-01 stsp } else if (blob2) {
2348 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2349 234035bc 2019-06-01 stsp path2) == -1)
2350 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2351 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2352 d6c87207 2019-08-02 stsp strlen(path2));
2354 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2355 7f91a133 2019-12-13 stsp -1, NULL, repo);
2357 234035bc 2019-06-01 stsp goto done;
2358 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2359 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2360 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2361 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2362 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2363 1ee397ad 2019-07-12 stsp status, path2);
2364 234035bc 2019-06-01 stsp goto done;
2366 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2367 f69721c3 2019-10-21 stsp NULL, ondisk_path, path2, sb.st_mode,
2368 f69721c3 2019-10-21 stsp a->label_orig, blob2, a->commit_id2, repo,
2369 f69721c3 2019-10-21 stsp a->progress_cb,
2370 f69721c3 2019-10-21 stsp a->progress_arg);
2371 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2372 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2373 054041d0 2020-06-24 stsp ondisk_path, blob2->id.sha1,
2374 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2376 234035bc 2019-06-01 stsp goto done;
2379 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2380 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2381 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2382 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2383 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2384 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2386 234035bc 2019-06-01 stsp goto done;
2387 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2389 234035bc 2019-06-01 stsp goto done;
2390 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2391 3969253a 2020-03-07 stsp NULL, NULL, 1);
2392 3969253a 2020-03-07 stsp if (err) {
2393 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2394 3969253a 2020-03-07 stsp goto done;
2396 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2397 2b92fad7 2019-06-02 stsp if (err) {
2398 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2399 2b92fad7 2019-06-02 stsp goto done;
2404 234035bc 2019-06-01 stsp free(ondisk_path);
2405 234035bc 2019-06-01 stsp return err;
2408 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2409 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2410 234035bc 2019-06-01 stsp struct got_repository *repo;
2413 234035bc 2019-06-01 stsp static const struct got_error *
2414 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2416 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2417 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2418 234035bc 2019-06-01 stsp unsigned char status;
2419 234035bc 2019-06-01 stsp struct stat sb;
2420 234035bc 2019-06-01 stsp char *ondisk_path;
2422 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2423 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2424 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2425 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2427 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2429 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2431 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2432 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2434 234035bc 2019-06-01 stsp return err;
2435 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2436 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2438 234035bc 2019-06-01 stsp return NULL;
2441 818c7501 2019-07-11 stsp static const struct got_error *
2442 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2443 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2444 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2445 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2446 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2448 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2449 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2450 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2451 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2452 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2454 03415a1a 2019-06-02 stsp if (commit_id1) {
2455 f69721c3 2019-10-21 stsp char *id_str;
2457 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2458 03415a1a 2019-06-02 stsp worktree->path_prefix);
2460 03415a1a 2019-06-02 stsp goto done;
2462 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2464 03415a1a 2019-06-02 stsp goto done;
2466 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2468 f69721c3 2019-10-21 stsp goto done;
2470 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2471 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2472 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2473 f69721c3 2019-10-21 stsp free(id_str);
2474 f69721c3 2019-10-21 stsp goto done;
2476 f69721c3 2019-10-21 stsp free(id_str);
2479 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2480 234035bc 2019-06-01 stsp worktree->path_prefix);
2482 234035bc 2019-06-01 stsp goto done;
2484 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2486 234035bc 2019-06-01 stsp goto done;
2488 234035bc 2019-06-01 stsp arg.worktree = worktree;
2489 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2490 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2491 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2492 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2493 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2494 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2495 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2496 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2497 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2498 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2499 af12c6b9 2019-06-04 stsp err = sync_err;
2501 234035bc 2019-06-01 stsp if (tree1)
2502 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2503 234035bc 2019-06-01 stsp if (tree2)
2504 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2505 f69721c3 2019-10-21 stsp free(label_orig);
2506 818c7501 2019-07-11 stsp return err;
2509 818c7501 2019-07-11 stsp const struct got_error *
2510 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2511 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2512 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2513 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2515 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2516 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2517 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2518 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2520 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2522 818c7501 2019-07-11 stsp return err;
2524 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2526 818c7501 2019-07-11 stsp goto done;
2528 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2529 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2530 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2531 818c7501 2019-07-11 stsp &mok_arg);
2533 818c7501 2019-07-11 stsp goto done;
2535 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2536 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2538 818c7501 2019-07-11 stsp if (fileindex)
2539 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2540 818c7501 2019-07-11 stsp free(fileindex_path);
2541 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2542 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2543 234035bc 2019-06-01 stsp err = unlockerr;
2544 234035bc 2019-06-01 stsp return err;
2547 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2548 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2549 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2550 927df6b7 2019-02-10 stsp const char *status_path;
2551 927df6b7 2019-02-10 stsp size_t status_path_len;
2552 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2553 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2554 f8d1f275 2019-02-04 stsp void *status_arg;
2555 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2556 f8d1f275 2019-02-04 stsp void *cancel_arg;
2557 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2558 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2559 f2a9dc41 2019-12-13 tracey int report_unchanged;
2560 3143d852 2020-06-25 stsp int no_ignores;
2563 f8d1f275 2019-02-04 stsp static const struct got_error *
2564 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2565 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
2566 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2567 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
2569 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2570 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2571 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2572 927df6b7 2019-02-10 stsp struct stat sb;
2573 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2574 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2575 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2577 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2579 98eaaa12 2019-08-03 stsp return err;
2581 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2582 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2583 98eaaa12 2019-08-03 stsp return NULL;
2585 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2586 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2587 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2589 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2590 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2591 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2593 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2594 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2595 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2596 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2597 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2600 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2601 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2604 927df6b7 2019-02-10 stsp static const struct got_error *
2605 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2606 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
2608 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2609 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2610 f8d1f275 2019-02-04 stsp char *abspath;
2612 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2613 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2615 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2616 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2617 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2618 927df6b7 2019-02-10 stsp return NULL;
2620 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2621 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2622 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2623 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2625 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2626 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2627 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2630 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
2631 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2632 f8d1f275 2019-02-04 stsp free(abspath);
2633 9d31a1d8 2018-03-11 stsp return err;
2636 f8d1f275 2019-02-04 stsp static const struct got_error *
2637 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2639 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2640 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2641 2ec1f75b 2019-03-26 stsp unsigned char status;
2643 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2644 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2646 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2647 927df6b7 2019-02-10 stsp return NULL;
2649 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2650 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2651 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2652 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2654 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2655 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2656 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2660 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2662 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2664 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2665 6841da00 2019-08-08 stsp free((char *)pe->path);
2666 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2670 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2672 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2674 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2675 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2676 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2677 6841da00 2019-08-08 stsp free((char *)pe->path);
2679 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2682 6841da00 2019-08-08 stsp static const struct got_error *
2683 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2685 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2686 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2687 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2688 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2689 6841da00 2019-08-08 stsp size_t linesize = 0;
2690 6841da00 2019-08-08 stsp ssize_t linelen;
2692 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2693 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2694 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2695 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2697 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2698 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2699 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2701 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
2702 bd8de430 2019-10-04 stsp if (line[0] == '#')
2705 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
2706 bd8de430 2019-10-04 stsp if (line[0] == '!')
2709 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2710 6841da00 2019-08-08 stsp line) == -1) {
2711 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2712 6841da00 2019-08-08 stsp goto done;
2714 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2716 6841da00 2019-08-08 stsp goto done;
2718 6841da00 2019-08-08 stsp if (ferror(f)) {
2719 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2720 6841da00 2019-08-08 stsp goto done;
2723 6841da00 2019-08-08 stsp dirpath = strdup(path);
2724 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2725 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2726 6841da00 2019-08-08 stsp goto done;
2728 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2730 6841da00 2019-08-08 stsp free(line);
2731 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2732 6841da00 2019-08-08 stsp free(dirpath);
2733 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2735 6841da00 2019-08-08 stsp return err;
2739 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2741 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2743 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
2744 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
2745 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
2746 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
2748 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2749 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
2751 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
2753 bd8de430 2019-10-04 stsp pattern += 3;
2755 bd8de430 2019-10-04 stsp while (*p) {
2756 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
2757 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
2758 bd8de430 2019-10-04 stsp /* Retry in next directory. */
2759 bd8de430 2019-10-04 stsp while (*p && *p != '/')
2761 bd8de430 2019-10-04 stsp while (*p == '/')
2771 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2772 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2773 6841da00 2019-08-08 stsp * ignores backwards.
2775 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2776 6841da00 2019-08-08 stsp while (pe) {
2777 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2778 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2779 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2780 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2781 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
2782 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
2783 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
2784 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
2785 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
2790 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2796 6841da00 2019-08-08 stsp static const struct got_error *
2797 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2798 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
2800 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2801 6841da00 2019-08-08 stsp char *ignorespath;
2802 886cec17 2019-12-15 stsp int fd = -1;
2803 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2805 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2806 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
2807 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2809 886cec17 2019-12-15 stsp if (dirfd != -1) {
2810 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
2811 886cec17 2019-12-15 stsp if (fd == -1) {
2812 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2813 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
2814 886cec17 2019-12-15 stsp ignorespath);
2816 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
2817 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
2818 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
2819 886cec17 2019-12-15 stsp ignorespath);
2822 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
2826 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
2827 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
2828 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2829 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
2830 886cec17 2019-12-15 stsp ignorespath);
2832 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
2835 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2836 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
2837 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2838 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
2839 6841da00 2019-08-08 stsp free(ignorespath);
2840 6841da00 2019-08-08 stsp return err;
2843 f8d1f275 2019-02-04 stsp static const struct got_error *
2844 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
2846 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2847 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2848 f8d1f275 2019-02-04 stsp char *path = NULL;
2850 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2851 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2853 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2854 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2855 927df6b7 2019-02-10 stsp return NULL;
2857 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2858 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2859 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2861 f8d1f275 2019-02-04 stsp path = de->d_name;
2864 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
2865 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
2866 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2867 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2868 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2869 f8d1f275 2019-02-04 stsp if (parent_path[0])
2870 f8d1f275 2019-02-04 stsp free(path);
2871 b72f483a 2019-02-05 stsp return err;
2874 347d1d3e 2019-07-12 stsp static const struct got_error *
2875 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
2877 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
2878 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
2880 3143d852 2020-06-25 stsp if (a->no_ignores)
2881 3143d852 2020-06-25 stsp return NULL;
2883 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
2884 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
2886 3143d852 2020-06-25 stsp return err;
2888 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
2889 3143d852 2020-06-25 stsp dirfd, ".gitignore");
2891 3143d852 2020-06-25 stsp return err;
2894 3143d852 2020-06-25 stsp static const struct got_error *
2895 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2896 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2897 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
2899 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2900 abb4604f 2019-07-27 stsp struct stat sb;
2902 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2904 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
2905 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
2907 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2908 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2909 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2910 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2911 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2912 abb4604f 2019-07-27 stsp return NULL;
2915 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2916 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2917 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2919 abb4604f 2019-07-27 stsp return NULL;
2922 3143d852 2020-06-25 stsp static const struct got_error *
2923 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
2924 3143d852 2020-06-25 stsp const char *root_path, const char *path)
2926 3143d852 2020-06-25 stsp const struct got_error *err;
2927 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
2929 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
2930 3143d852 2020-06-25 stsp ".cvsignore");
2932 3143d852 2020-06-25 stsp return err;
2934 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
2935 3143d852 2020-06-25 stsp ".gitignore");
2937 3143d852 2020-06-25 stsp return err;
2939 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
2940 3143d852 2020-06-25 stsp if (err) {
2941 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
2942 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
2943 3143d852 2020-06-25 stsp return err;
2945 3143d852 2020-06-25 stsp for (;;) {
2946 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
2947 3143d852 2020-06-25 stsp ".cvsignore");
2950 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
2951 3143d852 2020-06-25 stsp ".gitignore");
2954 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
2955 3143d852 2020-06-25 stsp if (err) {
2956 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
2957 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
2960 b737c85a 2020-06-26 stsp free(parent_path);
2961 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
2962 b737c85a 2020-06-26 stsp next_parent_path = NULL;
2965 b737c85a 2020-06-26 stsp free(parent_path);
2966 b737c85a 2020-06-26 stsp free(next_parent_path);
2967 3143d852 2020-06-25 stsp return err;
2970 abb4604f 2019-07-27 stsp static const struct got_error *
2971 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2972 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2973 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2974 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2975 f2a9dc41 2019-12-13 tracey int report_unchanged)
2977 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2978 6fc93f37 2019-12-13 stsp int fd = -1;
2979 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2980 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2981 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2983 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
2985 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2986 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2987 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2989 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2990 6fc93f37 2019-12-13 stsp if (fd == -1) {
2991 40b289d7 2019-09-07 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2992 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
2994 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2995 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
2996 f2a9dc41 2019-12-13 tracey report_unchanged);
2998 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2999 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3000 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3001 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3002 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3003 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3004 abb4604f 2019-07-27 stsp arg.status_path = path;
3005 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3006 abb4604f 2019-07-27 stsp arg.repo = repo;
3007 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3008 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3009 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3010 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3011 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3012 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3013 022fae89 2019-12-06 tracey if (!no_ignores) {
3014 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3015 3143d852 2020-06-25 stsp worktree->root_path, path);
3017 3143d852 2020-06-25 stsp goto done;
3019 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3020 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3023 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3024 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
3025 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3026 927df6b7 2019-02-10 stsp free(ondisk_path);
3027 347d1d3e 2019-07-12 stsp return err;
3030 347d1d3e 2019-07-12 stsp const struct got_error *
3031 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3032 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3033 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3034 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3036 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3037 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3038 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3039 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3041 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3043 347d1d3e 2019-07-12 stsp return err;
3045 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3046 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3047 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3051 f8d1f275 2019-02-04 stsp free(fileindex_path);
3052 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3053 f8d1f275 2019-02-04 stsp return err;
3056 6c7ab921 2019-03-18 stsp const struct got_error *
3057 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3058 6c7ab921 2019-03-18 stsp const char *arg)
3060 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3061 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
3062 6c7ab921 2019-03-18 stsp size_t len;
3064 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3066 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
3067 d0710d08 2019-07-22 stsp if (resolved == NULL) {
3068 d0710d08 2019-07-22 stsp if (errno != ENOENT)
3069 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
3070 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
3071 d0710d08 2019-07-22 stsp if (cwd == NULL)
3072 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
3073 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3074 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
3075 d0710d08 2019-07-22 stsp goto done;
3079 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3080 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3081 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3082 6c7ab921 2019-03-18 stsp goto done;
3085 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3086 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3087 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3089 f6d88e1a 2019-05-29 stsp goto done;
3091 f6d88e1a 2019-05-29 stsp path = strdup("");
3092 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3093 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3094 f6d88e1a 2019-05-29 stsp goto done;
3098 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3099 6c7ab921 2019-03-18 stsp len = strlen(path);
3100 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3101 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3105 6c7ab921 2019-03-18 stsp free(resolved);
3106 d0710d08 2019-07-22 stsp free(cwd);
3107 6c7ab921 2019-03-18 stsp if (err == NULL)
3108 6c7ab921 2019-03-18 stsp *wt_path = path;
3110 6c7ab921 2019-03-18 stsp free(path);
3111 d00136be 2019-03-26 stsp return err;
3114 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3115 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3116 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3117 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3118 4e68cba3 2019-11-23 stsp void *progress_arg;
3119 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3122 4e68cba3 2019-11-23 stsp static const struct got_error *
3123 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3124 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3125 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3126 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3128 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3129 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3130 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3131 6d022e97 2019-08-04 stsp struct stat sb;
3132 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3134 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3135 dbb83fbd 2019-12-12 stsp relpath) == -1)
3136 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3138 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3140 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3141 12463d8b 2019-12-13 stsp de_name, a->repo);
3143 dbb83fbd 2019-12-12 stsp goto done;
3144 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3145 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3146 dbb83fbd 2019-12-12 stsp goto done;
3147 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3149 dbb83fbd 2019-12-12 stsp goto done;
3152 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3153 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3154 dbb83fbd 2019-12-12 stsp goto done;
3157 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3159 4e68cba3 2019-11-23 stsp goto done;
3160 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3161 3969253a 2020-03-07 stsp if (err) {
3162 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3163 3969253a 2020-03-07 stsp goto done;
3165 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3166 07f5b47a 2019-06-02 stsp if (err) {
3167 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3168 4e68cba3 2019-11-23 stsp goto done;
3171 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3173 dbb83fbd 2019-12-12 stsp return err;
3174 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3175 dbb83fbd 2019-12-12 stsp return NULL;
3176 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3179 d00136be 2019-03-26 stsp const struct got_error *
3180 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3181 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3182 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3183 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3185 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3186 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3187 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3188 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3189 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3191 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3193 d00136be 2019-03-26 stsp return err;
3195 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3197 d00136be 2019-03-26 stsp goto done;
3199 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3200 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3201 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3202 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3203 4e68cba3 2019-11-23 stsp saa.repo = repo;
3205 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3206 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3207 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3211 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3212 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3213 af12c6b9 2019-06-04 stsp err = sync_err;
3215 fb399478 2019-07-12 stsp free(fileindex_path);
3216 d00136be 2019-03-26 stsp if (fileindex)
3217 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3218 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3219 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3220 d00136be 2019-03-26 stsp err = unlockerr;
3221 6c7ab921 2019-03-18 stsp return err;
3224 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3225 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3226 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3227 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3228 f2a9dc41 2019-12-13 tracey void *progress_arg;
3229 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3230 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3231 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3234 f2a9dc41 2019-12-13 tracey static const struct got_error *
3235 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3236 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3237 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3238 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3240 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3241 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3242 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3243 17ed4618 2019-06-02 stsp struct stat sb;
3244 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
3246 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3247 17ed4618 2019-06-02 stsp if (ie == NULL)
3248 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3250 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3251 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3252 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3253 9acbc4fa 2019-08-03 stsp return NULL;
3254 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3257 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3258 f2a9dc41 2019-12-13 tracey relpath) == -1)
3259 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3261 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3264 f2a9dc41 2019-12-13 tracey goto done;
3266 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3267 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3268 f2a9dc41 2019-12-13 tracey goto done;
3269 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3270 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3271 f2a9dc41 2019-12-13 tracey goto done;
3273 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3274 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3275 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3276 f2a9dc41 2019-12-13 tracey goto done;
3280 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3281 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3282 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3283 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3284 12463d8b 2019-12-13 stsp ondisk_path);
3285 12463d8b 2019-12-13 stsp goto done;
3287 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3288 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3289 12463d8b 2019-12-13 stsp goto done;
3292 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3294 15341bfd 2020-03-05 tracey if (parent == NULL) {
3295 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3296 15341bfd 2020-03-05 tracey goto done;
3298 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3299 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3300 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3301 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3302 15341bfd 2020-03-05 tracey parent);
3305 15341bfd 2020-03-05 tracey parent = dirname(parent);
3306 15341bfd 2020-03-05 tracey if (parent == NULL) {
3307 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3308 15341bfd 2020-03-05 tracey goto done;
3313 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3315 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3316 f2a9dc41 2019-12-13 tracey if (err)
3317 f2a9dc41 2019-12-13 tracey return err;
3318 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3319 f2a9dc41 2019-12-13 tracey return NULL;
3320 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3321 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3324 2ec1f75b 2019-03-26 stsp const struct got_error *
3325 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3326 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3327 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3328 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3330 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3331 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3332 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3333 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3334 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3336 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3338 2ec1f75b 2019-03-26 stsp return err;
3340 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3342 2ec1f75b 2019-03-26 stsp goto done;
3344 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3345 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3346 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3347 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3348 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3349 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3350 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3352 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3353 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3354 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3358 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3359 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3360 af12c6b9 2019-06-04 stsp err = sync_err;
3362 fb399478 2019-07-12 stsp free(fileindex_path);
3363 2ec1f75b 2019-03-26 stsp if (fileindex)
3364 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3365 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3366 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3367 2ec1f75b 2019-03-26 stsp err = unlockerr;
3368 33aa809d 2019-08-08 stsp return err;
3371 33aa809d 2019-08-08 stsp static const struct got_error *
3372 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3374 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3375 33aa809d 2019-08-08 stsp char *line = NULL;
3376 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3377 33aa809d 2019-08-08 stsp ssize_t linelen;
3379 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3380 33aa809d 2019-08-08 stsp if (linelen == -1) {
3381 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3382 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3383 33aa809d 2019-08-08 stsp goto done;
3385 33aa809d 2019-08-08 stsp return NULL;
3387 33aa809d 2019-08-08 stsp if (outfile) {
3388 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3389 33aa809d 2019-08-08 stsp if (n != linelen) {
3390 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3391 33aa809d 2019-08-08 stsp goto done;
3394 33aa809d 2019-08-08 stsp if (rejectfile) {
3395 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3396 33aa809d 2019-08-08 stsp if (n != linelen)
3397 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3400 33aa809d 2019-08-08 stsp free(line);
3401 2ec1f75b 2019-03-26 stsp return err;
3404 33aa809d 2019-08-08 stsp static const struct got_error *
3405 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3407 33aa809d 2019-08-08 stsp char *line = NULL;
3408 33aa809d 2019-08-08 stsp size_t linesize = 0;
3409 33aa809d 2019-08-08 stsp ssize_t linelen;
3411 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3412 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3413 500467ff 2019-09-25 hiltjo if (ferror(f))
3414 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3415 500467ff 2019-09-25 hiltjo return NULL;
3417 33aa809d 2019-08-08 stsp free(line);
3418 33aa809d 2019-08-08 stsp return NULL;
3421 33aa809d 2019-08-08 stsp static const struct got_error *
3422 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3423 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3424 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3426 33aa809d 2019-08-08 stsp const struct got_error *err;
3428 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3429 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3430 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3432 33aa809d 2019-08-08 stsp return err;
3433 33aa809d 2019-08-08 stsp (*line_cur1)++;
3435 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3436 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3437 33aa809d 2019-08-08 stsp if (rejectfile)
3438 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3440 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3442 33aa809d 2019-08-08 stsp return err;
3443 33aa809d 2019-08-08 stsp (*line_cur2)++;
3445 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3446 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3447 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3449 33aa809d 2019-08-08 stsp return err;
3450 33aa809d 2019-08-08 stsp (*line_cur2)++;
3452 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3453 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3454 33aa809d 2019-08-08 stsp if (rejectfile)
3455 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3457 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3459 33aa809d 2019-08-08 stsp return err;
3460 33aa809d 2019-08-08 stsp (*line_cur1)++;
3463 f1e81a05 2019-08-10 stsp return NULL;
3466 f1e81a05 2019-08-10 stsp static const struct got_error *
3467 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3468 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3470 f1e81a05 2019-08-10 stsp const struct got_error *err;
3472 f1e81a05 2019-08-10 stsp if (outfile) {
3473 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3474 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3475 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3477 f1e81a05 2019-08-10 stsp return err;
3478 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3481 f1e81a05 2019-08-10 stsp if (rejectfile) {
3482 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3483 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3484 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3486 f1e81a05 2019-08-10 stsp return err;
3487 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3491 33aa809d 2019-08-08 stsp return NULL;
3494 33aa809d 2019-08-08 stsp static const struct got_error *
3495 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3496 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3497 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3498 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3499 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3501 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3502 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3503 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3504 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3505 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
3506 33aa809d 2019-08-08 stsp long pos1, pos2;
3507 33aa809d 2019-08-08 stsp FILE *hunkfile;
3509 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3511 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
3512 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
3513 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
3515 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
3516 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
3518 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
3519 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3521 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
3522 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3523 33aa809d 2019-08-08 stsp goto done;
3525 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
3526 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3527 33aa809d 2019-08-08 stsp goto done;
3529 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3530 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
3531 33aa809d 2019-08-08 stsp goto done;
3534 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3535 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
3537 33aa809d 2019-08-08 stsp goto done;
3539 33aa809d 2019-08-08 stsp switch (*choice) {
3540 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
3541 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3542 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
3544 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3545 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3546 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3548 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3551 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3555 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3556 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3557 33aa809d 2019-08-08 stsp return err;
3560 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3561 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3562 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3563 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3564 1f1abb7e 2019-08-08 stsp void *progress_arg;
3565 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3566 33aa809d 2019-08-08 stsp void *patch_arg;
3567 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3570 e20a8b6f 2019-06-04 stsp static const struct got_error *
3571 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3572 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3573 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
3574 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3575 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3577 33aa809d 2019-08-08 stsp const struct got_error *err;
3578 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3579 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3580 1ebedb77 2019-10-19 stsp int fd2 = -1;
3581 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3582 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3583 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3584 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3585 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3586 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3587 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3588 33aa809d 2019-08-08 stsp int n = 0;
3590 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3592 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3594 33aa809d 2019-08-08 stsp return err;
3596 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
3597 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3598 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3599 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", path2);
3600 12463d8b 2019-12-13 stsp goto done;
3603 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3604 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3605 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", path2);
3606 12463d8b 2019-12-13 stsp goto done;
3609 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
3610 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
3611 1ebedb77 2019-10-19 stsp goto done;
3614 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
3615 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3616 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", path2);
3617 33aa809d 2019-08-08 stsp goto done;
3621 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3623 33aa809d 2019-08-08 stsp goto done;
3625 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3627 33aa809d 2019-08-08 stsp goto done;
3629 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3631 33aa809d 2019-08-08 stsp goto done;
3633 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3634 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3635 33aa809d 2019-08-08 stsp goto done;
3638 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3639 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3641 33aa809d 2019-08-08 stsp goto done;
3643 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3645 33aa809d 2019-08-08 stsp goto done;
3647 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3648 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3649 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3650 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3651 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3652 33aa809d 2019-08-08 stsp int choice;
3653 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3654 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3655 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3656 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3657 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3658 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3660 33aa809d 2019-08-08 stsp goto done;
3661 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3662 33aa809d 2019-08-08 stsp have_content = 1;
3663 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3666 1ebedb77 2019-10-19 stsp if (have_content) {
3667 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3668 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3669 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3671 1ebedb77 2019-10-19 stsp goto done;
3673 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
3674 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
3675 1ebedb77 2019-10-19 stsp goto done;
3679 33aa809d 2019-08-08 stsp free(id_str);
3681 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3682 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3683 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3684 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3685 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3686 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3687 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
3688 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3689 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3690 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3691 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3692 33aa809d 2019-08-08 stsp if (err || !have_content) {
3693 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3694 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3695 33aa809d 2019-08-08 stsp free(*path_outfile);
3696 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3698 33aa809d 2019-08-08 stsp free(args);
3700 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3703 33aa809d 2019-08-08 stsp if (changes)
3704 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3705 33aa809d 2019-08-08 stsp free(path1);
3706 33aa809d 2019-08-08 stsp return err;
3709 33aa809d 2019-08-08 stsp static const struct got_error *
3710 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3711 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3712 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3713 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3715 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3716 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3717 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3718 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3719 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3720 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3721 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3722 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3723 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3724 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3726 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3727 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3728 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3729 d3bcc3d1 2019-08-08 stsp return NULL;
3731 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3732 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3733 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3735 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3736 65084dad 2019-08-08 stsp if (ie == NULL)
3737 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3739 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3740 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3741 a129376b 2019-03-28 stsp if (err) {
3742 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3743 a129376b 2019-03-28 stsp goto done;
3744 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3745 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3746 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3747 e20a8b6f 2019-06-04 stsp goto done;
3750 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3751 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3752 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3753 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3754 a129376b 2019-03-28 stsp goto done;
3757 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3758 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3759 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3760 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3761 a129376b 2019-03-28 stsp goto done;
3764 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3765 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3766 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3767 a129376b 2019-03-28 stsp goto done;
3772 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3773 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3774 a9fa2909 2019-07-27 stsp if (err) {
3775 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3776 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3777 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3778 a9fa2909 2019-07-27 stsp goto done;
3780 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3782 a9fa2909 2019-07-27 stsp goto done;
3784 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3785 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3786 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3787 a9fa2909 2019-07-27 stsp goto done;
3790 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3791 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3792 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3793 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3794 a9fa2909 2019-07-27 stsp goto done;
3798 a129376b 2019-03-28 stsp switch (status) {
3799 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3800 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3801 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3802 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3803 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3805 33aa809d 2019-08-08 stsp goto done;
3806 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3809 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3810 1f1abb7e 2019-08-08 stsp ie->path);
3812 1ee397ad 2019-07-12 stsp goto done;
3813 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3815 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3816 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3817 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3818 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3819 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3821 33aa809d 2019-08-08 stsp goto done;
3822 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3825 33aa809d 2019-08-08 stsp /* fall through */
3826 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3827 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
3828 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3829 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3830 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3831 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3832 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3833 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3834 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3836 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3837 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3838 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3840 65084dad 2019-08-08 stsp goto done;
3842 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3843 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3844 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3845 a129376b 2019-03-28 stsp goto done;
3848 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3849 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3850 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3851 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
3852 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3853 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3855 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3856 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3857 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3858 33aa809d 2019-08-08 stsp goto done;
3861 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3862 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3863 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3864 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3866 a129376b 2019-03-28 stsp goto done;
3867 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
3868 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
3869 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3870 054041d0 2020-06-24 stsp ondisk_path, blob->id.sha1,
3871 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
3873 33aa809d 2019-08-08 stsp goto done;
3882 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3883 33aa809d 2019-08-08 stsp free(path_content);
3884 e20a8b6f 2019-06-04 stsp free(parent_path);
3885 a129376b 2019-03-28 stsp free(tree_path);
3887 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3889 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3890 a129376b 2019-03-28 stsp free(tree_id);
3891 e20a8b6f 2019-06-04 stsp return err;
3894 e20a8b6f 2019-06-04 stsp const struct got_error *
3895 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3896 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3897 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3898 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3899 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3901 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3902 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3903 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3904 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3905 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3906 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3908 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3910 e20a8b6f 2019-06-04 stsp return err;
3912 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3914 e20a8b6f 2019-06-04 stsp goto done;
3916 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3917 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3918 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3919 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3920 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3921 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3922 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3923 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3924 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3925 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
3929 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3930 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3931 e20a8b6f 2019-06-04 stsp err = sync_err;
3933 fb399478 2019-07-12 stsp free(fileindex_path);
3934 a129376b 2019-03-28 stsp if (fileindex)
3935 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3936 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3937 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3938 a129376b 2019-03-28 stsp err = unlockerr;
3939 c4296144 2019-05-09 stsp return err;
3942 cf066bf8 2019-05-09 stsp static void
3943 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3945 24519714 2019-05-09 stsp free(ct->path);
3946 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3947 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3948 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3949 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3950 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3951 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3955 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3956 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3957 24519714 2019-05-09 stsp struct got_repository *repo;
3958 24519714 2019-05-09 stsp struct got_worktree *worktree;
3959 5f8a88c6 2019-08-03 stsp int have_staged_files;
3962 c4296144 2019-05-09 stsp static const struct got_error *
3963 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3964 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3965 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3966 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3968 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3969 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3970 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3971 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3972 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3973 768aea60 2019-05-09 stsp struct stat sb;
3975 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3976 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3977 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3978 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3979 5f8a88c6 2019-08-03 stsp return NULL;
3981 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3982 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3984 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3985 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
3986 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3987 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3988 5f8a88c6 2019-08-03 stsp return NULL;
3991 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3992 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3993 036813ee 2019-05-09 stsp goto done;
3995 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3996 036813ee 2019-05-09 stsp parent_path = strdup("");
3997 69960a46 2019-05-09 stsp if (parent_path == NULL)
3998 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4000 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4002 69960a46 2019-05-09 stsp return err;
4005 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4006 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4007 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4008 c4296144 2019-05-09 stsp goto done;
4011 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4012 768aea60 2019-05-09 stsp relpath) == -1) {
4013 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4014 768aea60 2019-05-09 stsp goto done;
4016 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
4017 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
4019 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4020 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4021 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4022 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4023 12463d8b 2019-12-13 stsp ct->ondisk_path);
4024 12463d8b 2019-12-13 stsp goto done;
4026 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4027 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4028 768aea60 2019-05-09 stsp goto done;
4030 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4033 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4034 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4035 44d03001 2019-05-09 stsp relpath) == -1) {
4036 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4037 44d03001 2019-05-09 stsp goto done;
4040 cf066bf8 2019-05-09 stsp ct->status = status;
4041 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4042 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4043 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4044 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4045 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4046 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4047 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4048 b416585c 2019-05-13 stsp goto done;
4050 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4051 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4052 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4053 f0b75401 2019-08-03 stsp goto done;
4056 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4057 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4058 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4059 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4060 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4061 036813ee 2019-05-09 stsp goto done;
4064 24519714 2019-05-09 stsp ct->path = strdup(path);
4065 24519714 2019-05-09 stsp if (ct->path == NULL) {
4066 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4067 24519714 2019-05-09 stsp goto done;
4069 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4071 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4072 ed175427 2019-05-09 stsp free_commitable(ct);
4073 24519714 2019-05-09 stsp free(parent_path);
4074 036813ee 2019-05-09 stsp free(path);
4075 a129376b 2019-03-28 stsp return err;
4078 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4079 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4080 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4081 036813ee 2019-05-09 stsp struct got_repository *);
4083 ed175427 2019-05-09 stsp static const struct got_error *
4084 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4085 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4086 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4087 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4088 afa376bf 2019-05-09 stsp struct got_repository *repo)
4090 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4091 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4092 036813ee 2019-05-09 stsp char *subpath;
4094 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4095 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4096 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4098 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4100 ed175427 2019-05-09 stsp return err;
4102 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4103 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4104 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4105 036813ee 2019-05-09 stsp free(subpath);
4106 036813ee 2019-05-09 stsp return err;
4109 036813ee 2019-05-09 stsp static const struct got_error *
4110 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4112 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4113 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4115 036813ee 2019-05-09 stsp *match = 0;
4117 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4118 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4119 0f63689d 2019-05-10 stsp return NULL;
4122 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4124 0f63689d 2019-05-10 stsp return err;
4125 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4126 036813ee 2019-05-09 stsp free(ct_parent_path);
4127 036813ee 2019-05-09 stsp return err;
4130 768aea60 2019-05-09 stsp static mode_t
4131 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4133 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4136 036813ee 2019-05-09 stsp static const struct got_error *
4137 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4138 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4140 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4142 036813ee 2019-05-09 stsp *new_te = NULL;
4144 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4146 036813ee 2019-05-09 stsp goto done;
4148 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4150 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4151 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4152 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4154 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4156 036813ee 2019-05-09 stsp if (err && *new_te) {
4157 56e0773d 2019-11-28 stsp free(*new_te);
4158 036813ee 2019-05-09 stsp *new_te = NULL;
4160 036813ee 2019-05-09 stsp return err;
4163 036813ee 2019-05-09 stsp static const struct got_error *
4164 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4165 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4167 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4168 036813ee 2019-05-09 stsp char *ct_name;
4170 036813ee 2019-05-09 stsp *new_te = NULL;
4172 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4173 036813ee 2019-05-09 stsp if (*new_te == NULL)
4174 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4176 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
4177 036813ee 2019-05-09 stsp if (ct_name == NULL) {
4178 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
4179 036813ee 2019-05-09 stsp goto done;
4181 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4182 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4183 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4184 036813ee 2019-05-09 stsp goto done;
4187 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4189 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4190 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4191 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4193 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4195 036813ee 2019-05-09 stsp if (err && *new_te) {
4196 56e0773d 2019-11-28 stsp free(*new_te);
4197 036813ee 2019-05-09 stsp *new_te = NULL;
4199 036813ee 2019-05-09 stsp return err;
4202 036813ee 2019-05-09 stsp static const struct got_error *
4203 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
4204 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
4206 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4207 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
4209 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4211 036813ee 2019-05-09 stsp return err;
4212 036813ee 2019-05-09 stsp if (new_pe == NULL)
4213 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
4214 036813ee 2019-05-09 stsp return NULL;
4217 afa376bf 2019-05-09 stsp static const struct got_error *
4218 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
4219 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
4221 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
4222 5f8a88c6 2019-08-03 stsp unsigned char status;
4224 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
4225 afa376bf 2019-05-09 stsp ct_path++;
4227 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4228 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
4230 5f8a88c6 2019-08-03 stsp status = ct->status;
4232 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4233 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4236 036813ee 2019-05-09 stsp static const struct got_error *
4237 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4238 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4240 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4241 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4242 44d03001 2019-05-09 stsp char *te_path;
4244 44d03001 2019-05-09 stsp *modified = 0;
4246 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4247 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4248 44d03001 2019-05-09 stsp te->name) == -1)
4249 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4251 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4252 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4253 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4254 44d03001 2019-05-09 stsp strlen(te_path));
4255 44d03001 2019-05-09 stsp if (*modified)
4259 44d03001 2019-05-09 stsp free(te_path);
4260 44d03001 2019-05-09 stsp return err;
4263 44d03001 2019-05-09 stsp static const struct got_error *
4264 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4265 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4266 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4268 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4269 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4271 036813ee 2019-05-09 stsp *ctp = NULL;
4273 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4274 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4275 036813ee 2019-05-09 stsp char *ct_name = NULL;
4276 036813ee 2019-05-09 stsp int path_matches;
4278 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4279 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
4280 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
4281 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
4284 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
4285 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
4289 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4292 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4294 036813ee 2019-05-09 stsp return err;
4295 036813ee 2019-05-09 stsp if (!path_matches)
4298 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
4299 036813ee 2019-05-09 stsp if (ct_name == NULL)
4300 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
4302 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
4305 036813ee 2019-05-09 stsp *ctp = ct;
4309 2b496619 2019-07-10 stsp return err;
4312 2b496619 2019-07-10 stsp static const struct got_error *
4313 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4314 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
4315 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
4316 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
4317 2b496619 2019-07-10 stsp struct got_repository *repo)
4319 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
4320 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
4321 2b496619 2019-07-10 stsp char *subtree_path;
4322 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
4323 ba580f68 2020-03-22 stsp int nentries;
4325 2b496619 2019-07-10 stsp *new_tep = NULL;
4327 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4328 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
4329 2b496619 2019-07-10 stsp child_path) == -1)
4330 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
4332 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
4333 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
4334 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
4335 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
4337 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4338 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
4339 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4340 2b496619 2019-07-10 stsp goto done;
4342 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
4343 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
4344 2b496619 2019-07-10 stsp if (err) {
4345 56e0773d 2019-11-28 stsp free(new_te);
4346 2b496619 2019-07-10 stsp goto done;
4348 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
4351 2b496619 2019-07-10 stsp free(subtree_path);
4352 2b496619 2019-07-10 stsp if (err == NULL)
4353 2b496619 2019-07-10 stsp *new_tep = new_te;
4354 036813ee 2019-05-09 stsp return err;
4357 036813ee 2019-05-09 stsp static const struct got_error *
4358 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
4359 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
4360 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4361 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4362 036813ee 2019-05-09 stsp struct got_repository *repo)
4364 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4365 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
4366 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
4367 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4369 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
4370 ba580f68 2020-03-22 stsp *nentries = 0;
4372 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
4373 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4374 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4375 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
4377 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
4378 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
4379 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
4382 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
4383 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
4386 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4387 036813ee 2019-05-09 stsp pe->path);
4389 036813ee 2019-05-09 stsp goto done;
4391 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
4392 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
4393 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
4395 036813ee 2019-05-09 stsp goto done;
4396 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
4398 afa376bf 2019-05-09 stsp goto done;
4399 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
4400 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4402 2f51b5b3 2019-05-09 stsp goto done;
4403 ba580f68 2020-03-22 stsp (*nentries)++;
4405 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
4406 2b496619 2019-07-10 stsp if (base_tree == NULL ||
4407 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
4408 2b496619 2019-07-10 stsp == NULL) {
4409 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
4410 2b496619 2019-07-10 stsp child_path, path_base_tree,
4411 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
4414 2b496619 2019-07-10 stsp goto done;
4415 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4417 2b496619 2019-07-10 stsp goto done;
4418 ba580f68 2020-03-22 stsp (*nentries)++;
4423 2f51b5b3 2019-05-09 stsp if (base_tree) {
4424 56e0773d 2019-11-28 stsp int i, nbase_entries;
4425 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
4426 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
4427 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
4428 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4430 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
4431 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
4432 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
4433 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
4435 63c5ca5d 2019-08-24 stsp goto done;
4436 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
4438 63c5ca5d 2019-08-24 stsp goto done;
4439 ba580f68 2020-03-22 stsp (*nentries)++;
4443 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
4444 44d03001 2019-05-09 stsp int modified;
4445 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4447 036813ee 2019-05-09 stsp goto done;
4448 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
4449 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4451 2f51b5b3 2019-05-09 stsp goto done;
4452 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4453 44d03001 2019-05-09 stsp if (modified) {
4454 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
4455 ba580f68 2020-03-22 stsp int nsubentries;
4456 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
4457 ba580f68 2020-03-22 stsp &nsubentries, te,
4458 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4459 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4461 44d03001 2019-05-09 stsp goto done;
4462 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
4463 ba580f68 2020-03-22 stsp /* All entries were deleted. */
4464 ba580f68 2020-03-22 stsp free(new_id);
4467 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
4468 56e0773d 2019-11-28 stsp sizeof(new_te->id));
4469 56e0773d 2019-11-28 stsp free(new_id);
4471 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4473 036813ee 2019-05-09 stsp goto done;
4474 ba580f68 2020-03-22 stsp (*nentries)++;
4478 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4479 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4481 f66c734c 2019-09-22 stsp goto done;
4483 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4484 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4485 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4486 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4487 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4488 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
4490 2f51b5b3 2019-05-09 stsp goto done;
4491 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4493 2f51b5b3 2019-05-09 stsp goto done;
4494 ba580f68 2020-03-22 stsp (*nentries)++;
4496 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
4497 b416585c 2019-05-13 stsp status_arg);
4499 afa376bf 2019-05-09 stsp goto done;
4501 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
4502 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4504 2f51b5b3 2019-05-09 stsp goto done;
4505 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4507 2f51b5b3 2019-05-09 stsp goto done;
4508 ba580f68 2020-03-22 stsp (*nentries)++;
4513 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
4514 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
4516 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
4517 ed175427 2019-05-09 stsp return err;
4520 ebf99748 2019-05-09 stsp static const struct got_error *
4521 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4522 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4523 72fd46fa 2019-09-06 stsp int have_staged_files)
4525 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
4526 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
4528 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4529 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
4530 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4532 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4534 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
4535 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
4536 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
4537 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
4538 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4539 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
4540 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
4541 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
4542 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
4543 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4544 72fd46fa 2019-09-06 stsp !have_staged_files);
4546 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
4547 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
4548 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4549 72fd46fa 2019-09-06 stsp !have_staged_files);
4551 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
4554 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
4555 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
4556 3969253a 2020-03-07 stsp if (err) {
4557 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4560 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
4561 3969253a 2020-03-07 stsp if (err) {
4562 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4567 d56d26ce 2019-05-10 stsp return err;
4571 d56d26ce 2019-05-10 stsp static const struct got_error *
4572 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
4573 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
4574 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
4575 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
4576 735ef5ac 2019-08-03 stsp int ood_errcode)
4578 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
4579 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
4581 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4582 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
4583 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4584 1a36436d 2019-06-10 stsp return NULL;
4586 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
4587 9bead371 2019-07-28 stsp * on matches file content in the branch head.
4589 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4590 735ef5ac 2019-08-03 stsp in_repo_path);
4591 9bead371 2019-07-28 stsp if (err) {
4592 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
4593 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
4594 1a36436d 2019-06-10 stsp goto done;
4595 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4596 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4598 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4599 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4600 735ef5ac 2019-08-03 stsp in_repo_path);
4601 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4602 1a36436d 2019-06-10 stsp goto done;
4603 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4607 1a36436d 2019-06-10 stsp return err;
4610 c4296144 2019-05-09 stsp const struct got_error *
4611 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4612 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4613 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4614 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4615 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4616 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4617 afa376bf 2019-05-09 stsp struct got_repository *repo)
4619 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4620 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4621 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4622 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4623 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4624 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4625 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4626 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4627 ba580f68 2020-03-22 stsp int nentries;
4628 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4629 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4630 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4632 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4634 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4636 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4638 588edf97 2019-05-10 stsp goto done;
4640 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4642 588edf97 2019-05-10 stsp goto done;
4644 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4645 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4650 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4651 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4655 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4656 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4657 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4658 cf066bf8 2019-05-09 stsp char *ondisk_path;
4660 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4661 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4662 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4665 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4666 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
4667 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
4670 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4671 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4672 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4673 cf066bf8 2019-05-09 stsp goto done;
4675 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4676 a7055788 2019-05-09 stsp free(ondisk_path);
4678 cf066bf8 2019-05-09 stsp goto done;
4681 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4682 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
4683 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4685 036813ee 2019-05-09 stsp goto done;
4687 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4689 de18fc63 2019-05-09 stsp goto done;
4690 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4691 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4692 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4693 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4694 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4695 33ad4cbe 2019-05-12 jcs free(logmsg);
4697 9d40349a 2019-05-09 stsp goto done;
4699 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4700 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4701 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4702 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4703 09f5bd90 2019-05-09 stsp goto done;
4705 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4706 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4708 09f5bd90 2019-05-09 stsp goto done;
4709 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4711 ebf99748 2019-05-09 stsp goto done;
4712 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4713 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4714 09f5bd90 2019-05-09 stsp goto done;
4716 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4717 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4719 f2c16586 2019-05-09 stsp goto done;
4720 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4722 f2c16586 2019-05-09 stsp goto done;
4724 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4726 09f5bd90 2019-05-09 stsp goto done;
4728 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4730 ebf99748 2019-05-09 stsp goto done;
4732 588edf97 2019-05-10 stsp if (head_tree)
4733 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4734 588edf97 2019-05-10 stsp if (head_commit)
4735 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4736 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4737 2f17228e 2019-05-12 stsp if (head_ref2) {
4738 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4739 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4740 2f17228e 2019-05-12 stsp err = unlockerr;
4741 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4743 39cd0ff6 2019-07-12 stsp return err;
4746 5c1e53bc 2019-07-28 stsp static const struct got_error *
4747 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4748 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4750 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4751 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4753 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4754 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4755 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4757 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4758 5c1e53bc 2019-07-28 stsp ct_path++;
4760 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4761 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4765 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4766 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4768 5c1e53bc 2019-07-28 stsp return NULL;
4771 f0b75401 2019-08-03 stsp static const struct got_error *
4772 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4774 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4776 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4777 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4778 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4781 f0b75401 2019-08-03 stsp return NULL;
4784 5f8a88c6 2019-08-03 stsp static const struct got_error *
4785 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4786 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4788 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4789 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4791 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4792 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4794 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4795 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4796 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4797 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4798 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4799 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4802 5f8a88c6 2019-08-03 stsp return NULL;
4805 39cd0ff6 2019-07-12 stsp const struct got_error *
4806 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4807 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4808 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4809 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4810 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4811 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4813 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4814 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4815 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4816 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4817 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4818 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4819 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4820 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4821 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4823 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4825 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4827 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4829 39cd0ff6 2019-07-12 stsp goto done;
4831 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4833 39cd0ff6 2019-07-12 stsp goto done;
4835 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4837 39cd0ff6 2019-07-12 stsp goto done;
4839 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4841 39cd0ff6 2019-07-12 stsp goto done;
4843 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4844 5f8a88c6 2019-08-03 stsp &have_staged_files);
4845 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4846 5f8a88c6 2019-08-03 stsp goto done;
4847 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4848 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4850 5f8a88c6 2019-08-03 stsp goto done;
4853 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4854 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4855 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4856 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4857 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4858 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4859 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4861 5c1e53bc 2019-07-28 stsp goto done;
4864 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4865 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4866 39cd0ff6 2019-07-12 stsp goto done;
4869 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4870 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4872 5c1e53bc 2019-07-28 stsp goto done;
4875 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4876 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4877 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4879 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4880 f0b75401 2019-08-03 stsp ct_path++;
4881 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4882 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4883 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4885 b50cabdf 2019-07-12 stsp goto done;
4889 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4890 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4891 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4893 39cd0ff6 2019-07-12 stsp goto done;
4895 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4896 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
4897 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4898 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4899 39cd0ff6 2019-07-12 stsp err = sync_err;
4901 39cd0ff6 2019-07-12 stsp if (fileindex)
4902 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4903 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4904 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4905 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4906 39cd0ff6 2019-07-12 stsp err = unlockerr;
4907 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4908 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4909 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4911 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4912 c4296144 2019-05-09 stsp return err;
4915 8656d6c4 2019-05-20 stsp const char *
4916 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4918 8656d6c4 2019-05-20 stsp return ct->path;
4921 8656d6c4 2019-05-20 stsp unsigned int
4922 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4924 8656d6c4 2019-05-20 stsp return ct->status;
4927 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4928 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4929 818c7501 2019-07-11 stsp struct got_repository *repo;
4932 818c7501 2019-07-11 stsp static const struct got_error *
4933 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4935 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4936 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4937 818c7501 2019-07-11 stsp unsigned char status;
4938 818c7501 2019-07-11 stsp struct stat sb;
4939 818c7501 2019-07-11 stsp char *ondisk_path;
4941 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4942 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4943 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4944 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4946 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4948 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4950 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4951 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
4952 818c7501 2019-07-11 stsp free(ondisk_path);
4954 818c7501 2019-07-11 stsp return err;
4956 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4957 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4958 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4959 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4961 818c7501 2019-07-11 stsp return NULL;
4964 818c7501 2019-07-11 stsp const struct got_error *
4965 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4966 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4967 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4968 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4970 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4971 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4972 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4973 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4974 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4975 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4976 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
4978 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4979 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4980 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4982 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4984 818c7501 2019-07-11 stsp return err;
4986 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4988 818c7501 2019-07-11 stsp goto done;
4990 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4991 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4992 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4995 818c7501 2019-07-11 stsp goto done;
4997 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4999 818c7501 2019-07-11 stsp goto done;
5001 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5003 818c7501 2019-07-11 stsp goto done;
5005 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5007 818c7501 2019-07-11 stsp goto done;
5009 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5012 e51d7b55 2020-01-04 stsp goto done;
5014 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5016 818c7501 2019-07-11 stsp goto done;
5017 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5018 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5019 e51d7b55 2020-01-04 stsp goto done;
5022 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5023 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5025 818c7501 2019-07-11 stsp goto done;
5026 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5028 818c7501 2019-07-11 stsp goto done;
5030 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5032 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5034 818c7501 2019-07-11 stsp goto done;
5036 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5038 818c7501 2019-07-11 stsp goto done;
5040 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5041 818c7501 2019-07-11 stsp worktree->base_commit_id);
5043 818c7501 2019-07-11 stsp goto done;
5044 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5046 818c7501 2019-07-11 stsp goto done;
5048 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5050 818c7501 2019-07-11 stsp goto done;
5052 818c7501 2019-07-11 stsp free(fileindex_path);
5053 818c7501 2019-07-11 stsp free(tmp_branch_name);
5054 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5055 818c7501 2019-07-11 stsp free(branch_ref_name);
5056 818c7501 2019-07-11 stsp if (branch_ref)
5057 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5058 818c7501 2019-07-11 stsp if (wt_branch)
5059 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5060 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5061 818c7501 2019-07-11 stsp if (err) {
5062 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5063 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5064 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5066 818c7501 2019-07-11 stsp if (*tmp_branch) {
5067 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5068 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5070 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5071 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5072 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5074 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5076 818c7501 2019-07-11 stsp return err;
5079 818c7501 2019-07-11 stsp const struct got_error *
5080 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5081 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5082 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5083 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5085 818c7501 2019-07-11 stsp const struct got_error *err;
5086 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5087 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5088 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5089 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5090 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5092 818c7501 2019-07-11 stsp *commit_id = NULL;
5093 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5094 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5095 3e3a69f1 2019-07-25 stsp *branch = NULL;
5096 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5098 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5100 3e3a69f1 2019-07-25 stsp return err;
5102 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5104 f032f1f7 2019-08-04 stsp goto done;
5106 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5107 f032f1f7 2019-08-04 stsp &have_staged_files);
5108 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5109 f032f1f7 2019-08-04 stsp goto done;
5110 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5111 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5112 3e3a69f1 2019-07-25 stsp goto done;
5115 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5117 f032f1f7 2019-08-04 stsp goto done;
5119 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5121 818c7501 2019-07-11 stsp goto done;
5123 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5125 818c7501 2019-07-11 stsp goto done;
5127 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5129 818c7501 2019-07-11 stsp goto done;
5131 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5133 818c7501 2019-07-11 stsp goto done;
5135 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5136 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5138 818c7501 2019-07-11 stsp goto done;
5140 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5142 818c7501 2019-07-11 stsp goto done;
5144 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5146 818c7501 2019-07-11 stsp goto done;
5148 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5149 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5151 818c7501 2019-07-11 stsp goto done;
5153 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5155 818c7501 2019-07-11 stsp goto done;
5157 818c7501 2019-07-11 stsp free(commit_ref_name);
5158 818c7501 2019-07-11 stsp free(branch_ref_name);
5159 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5160 818c7501 2019-07-11 stsp if (commit_ref)
5161 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5162 818c7501 2019-07-11 stsp if (branch_ref)
5163 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5164 818c7501 2019-07-11 stsp if (err) {
5165 818c7501 2019-07-11 stsp free(*commit_id);
5166 818c7501 2019-07-11 stsp *commit_id = NULL;
5167 818c7501 2019-07-11 stsp if (*tmp_branch) {
5168 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5169 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5171 818c7501 2019-07-11 stsp if (*new_base_branch) {
5172 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5173 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5175 818c7501 2019-07-11 stsp if (*branch) {
5176 818c7501 2019-07-11 stsp got_ref_close(*branch);
5177 818c7501 2019-07-11 stsp *branch = NULL;
5179 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5180 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5181 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5183 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
5185 818c7501 2019-07-11 stsp return err;
5188 818c7501 2019-07-11 stsp const struct got_error *
5189 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5191 818c7501 2019-07-11 stsp const struct got_error *err;
5192 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
5194 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5196 818c7501 2019-07-11 stsp return err;
5198 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5199 818c7501 2019-07-11 stsp free(tmp_branch_name);
5200 818c7501 2019-07-11 stsp return NULL;
5203 818c7501 2019-07-11 stsp static const struct got_error *
5204 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5205 818c7501 2019-07-11 stsp char **logmsg, void *arg)
5207 0ebf8283 2019-07-24 stsp *logmsg = arg;
5208 818c7501 2019-07-11 stsp return NULL;
5211 818c7501 2019-07-11 stsp static const struct got_error *
5212 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5213 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5214 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5215 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5217 818c7501 2019-07-11 stsp return NULL;
5220 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
5221 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
5222 01757395 2019-07-12 stsp void *progress_arg;
5223 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
5226 01757395 2019-07-12 stsp static const struct got_error *
5227 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
5229 01757395 2019-07-12 stsp const struct got_error *err;
5230 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5232 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5234 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5236 01757395 2019-07-12 stsp return err;
5238 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5239 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5240 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5241 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5242 01757395 2019-07-12 stsp return NULL;
5244 01757395 2019-07-12 stsp p = strdup(path);
5245 01757395 2019-07-12 stsp if (p == NULL)
5246 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5248 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5249 01757395 2019-07-12 stsp if (err || new == NULL)
5251 01757395 2019-07-12 stsp return err;
5255 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5257 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5259 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5260 01757395 2019-07-12 stsp free((char *)pe->path);
5262 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
5265 0ebf8283 2019-07-24 stsp static const struct got_error *
5266 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5267 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
5269 818c7501 2019-07-11 stsp const struct got_error *err;
5270 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
5272 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5273 818c7501 2019-07-11 stsp if (err) {
5274 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
5275 818c7501 2019-07-11 stsp goto done;
5276 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
5278 818c7501 2019-07-11 stsp goto done;
5279 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
5281 818c7501 2019-07-11 stsp goto done;
5282 de05890f 2020-03-05 stsp } else if (is_rebase) {
5283 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
5286 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
5288 818c7501 2019-07-11 stsp goto done;
5289 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
5290 818c7501 2019-07-11 stsp free(stored_id);
5291 818c7501 2019-07-11 stsp if (cmp != 0) {
5292 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5293 818c7501 2019-07-11 stsp goto done;
5297 0ebf8283 2019-07-24 stsp if (commit_ref)
5298 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5299 0ebf8283 2019-07-24 stsp return err;
5302 0ebf8283 2019-07-24 stsp static const struct got_error *
5303 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
5304 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
5305 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5306 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
5307 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5308 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5310 0ebf8283 2019-07-24 stsp const struct got_error *err;
5311 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5312 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
5313 3e3a69f1 2019-07-25 stsp char *fileindex_path;
5315 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5317 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5319 0ebf8283 2019-07-24 stsp return err;
5321 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
5322 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
5323 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
5324 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
5325 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
5326 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
5327 818c7501 2019-07-11 stsp if (commit_ref)
5328 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5329 818c7501 2019-07-11 stsp return err;
5332 818c7501 2019-07-11 stsp const struct got_error *
5333 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5334 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5335 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5336 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5337 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5338 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5340 0ebf8283 2019-07-24 stsp const struct got_error *err;
5341 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5343 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5345 0ebf8283 2019-07-24 stsp return err;
5347 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
5349 0ebf8283 2019-07-24 stsp goto done;
5351 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5352 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5353 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5355 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5356 0ebf8283 2019-07-24 stsp return err;
5359 0ebf8283 2019-07-24 stsp const struct got_error *
5360 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5361 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5362 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5363 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5364 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5365 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5367 0ebf8283 2019-07-24 stsp const struct got_error *err;
5368 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5370 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5372 0ebf8283 2019-07-24 stsp return err;
5374 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5376 0ebf8283 2019-07-24 stsp goto done;
5378 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5379 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5380 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5382 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5383 0ebf8283 2019-07-24 stsp return err;
5386 0ebf8283 2019-07-24 stsp static const struct got_error *
5387 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
5388 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5389 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5390 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5391 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
5393 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
5394 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5395 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5396 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5397 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
5398 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5399 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
5401 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5402 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
5404 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5406 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5408 3e3a69f1 2019-07-25 stsp return err;
5410 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5411 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
5412 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
5413 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
5415 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
5416 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
5417 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
5418 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
5420 01757395 2019-07-12 stsp if (merged_paths) {
5421 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5422 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
5423 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
5424 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5427 01757395 2019-07-12 stsp goto done;
5430 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5431 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5433 01757395 2019-07-12 stsp goto done;
5436 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5437 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
5438 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5440 a0e95631 2019-07-12 stsp goto done;
5441 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5442 a0e95631 2019-07-12 stsp goto done;
5445 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5447 edd02c5e 2019-07-11 stsp goto done;
5449 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5451 818c7501 2019-07-11 stsp goto done;
5453 5943eee2 2019-08-13 stsp if (new_logmsg) {
5454 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
5455 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
5456 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5457 5943eee2 2019-08-13 stsp goto done;
5460 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5462 5943eee2 2019-08-13 stsp goto done;
5465 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
5466 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5467 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
5468 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
5469 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5471 a0e95631 2019-07-12 stsp goto done;
5473 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
5475 a0e95631 2019-07-12 stsp goto done;
5477 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5479 a0e95631 2019-07-12 stsp goto done;
5481 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5482 72fd46fa 2019-09-06 stsp fileindex, 0);
5483 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5484 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
5485 a0e95631 2019-07-12 stsp err = sync_err;
5487 a0e95631 2019-07-12 stsp free(fileindex_path);
5488 a0e95631 2019-07-12 stsp free(head_commit_id);
5489 a0e95631 2019-07-12 stsp if (head_ref)
5490 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
5491 818c7501 2019-07-11 stsp if (err) {
5492 818c7501 2019-07-11 stsp free(*new_commit_id);
5493 818c7501 2019-07-11 stsp *new_commit_id = NULL;
5495 818c7501 2019-07-11 stsp return err;
5498 818c7501 2019-07-11 stsp const struct got_error *
5499 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5500 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5501 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5502 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5503 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
5505 0ebf8283 2019-07-24 stsp const struct got_error *err;
5506 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5507 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5508 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5510 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5512 0ebf8283 2019-07-24 stsp return err;
5514 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5516 0ebf8283 2019-07-24 stsp goto done;
5517 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5519 0ebf8283 2019-07-24 stsp goto done;
5520 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5521 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5522 0ebf8283 2019-07-24 stsp goto done;
5525 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5526 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5528 0ebf8283 2019-07-24 stsp if (commit_ref)
5529 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5530 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5531 0ebf8283 2019-07-24 stsp free(commit_id);
5532 0ebf8283 2019-07-24 stsp return err;
5535 0ebf8283 2019-07-24 stsp const struct got_error *
5536 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5537 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5538 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5539 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5540 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
5541 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5543 0ebf8283 2019-07-24 stsp const struct got_error *err;
5544 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5545 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5547 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5549 0ebf8283 2019-07-24 stsp return err;
5551 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5553 0ebf8283 2019-07-24 stsp goto done;
5555 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5556 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5558 0ebf8283 2019-07-24 stsp if (commit_ref)
5559 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5560 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5561 0ebf8283 2019-07-24 stsp return err;
5564 0ebf8283 2019-07-24 stsp const struct got_error *
5565 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
5566 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5568 3e3a69f1 2019-07-25 stsp if (fileindex)
5569 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5570 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
5573 69844fba 2019-07-11 stsp static const struct got_error *
5574 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
5576 69844fba 2019-07-11 stsp const struct got_error *err;
5577 69844fba 2019-07-11 stsp struct got_reference *ref;
5579 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
5580 69844fba 2019-07-11 stsp if (err) {
5581 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
5582 69844fba 2019-07-11 stsp return NULL;
5583 69844fba 2019-07-11 stsp return err;
5586 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
5587 69844fba 2019-07-11 stsp got_ref_close(ref);
5588 69844fba 2019-07-11 stsp return err;
5591 69844fba 2019-07-11 stsp static const struct got_error *
5592 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5594 69844fba 2019-07-11 stsp const struct got_error *err;
5595 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5596 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5598 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5600 69844fba 2019-07-11 stsp goto done;
5601 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5603 69844fba 2019-07-11 stsp goto done;
5605 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5607 69844fba 2019-07-11 stsp goto done;
5608 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5610 69844fba 2019-07-11 stsp goto done;
5612 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5614 69844fba 2019-07-11 stsp goto done;
5615 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5617 69844fba 2019-07-11 stsp goto done;
5619 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5621 69844fba 2019-07-11 stsp goto done;
5622 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5624 69844fba 2019-07-11 stsp goto done;
5627 69844fba 2019-07-11 stsp free(tmp_branch_name);
5628 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5629 69844fba 2019-07-11 stsp free(branch_ref_name);
5630 69844fba 2019-07-11 stsp free(commit_ref_name);
5631 69844fba 2019-07-11 stsp return err;
5634 818c7501 2019-07-11 stsp const struct got_error *
5635 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5636 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5637 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5638 818c7501 2019-07-11 stsp struct got_repository *repo)
5640 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5641 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5643 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5645 818c7501 2019-07-11 stsp return err;
5647 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5649 818c7501 2019-07-11 stsp goto done;
5651 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5653 818c7501 2019-07-11 stsp goto done;
5655 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5657 818c7501 2019-07-11 stsp goto done;
5659 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5661 3e3a69f1 2019-07-25 stsp if (fileindex)
5662 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5663 818c7501 2019-07-11 stsp free(new_head_commit_id);
5664 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5665 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5666 818c7501 2019-07-11 stsp err = unlockerr;
5667 818c7501 2019-07-11 stsp return err;
5670 818c7501 2019-07-11 stsp const struct got_error *
5671 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5672 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5673 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5674 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5676 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5677 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5678 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5679 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5680 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5681 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5683 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5685 818c7501 2019-07-11 stsp return err;
5687 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5688 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5690 818c7501 2019-07-11 stsp goto done;
5692 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5694 818c7501 2019-07-11 stsp goto done;
5697 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5698 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5699 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5701 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5703 818c7501 2019-07-11 stsp goto done;
5705 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5707 818c7501 2019-07-11 stsp goto done;
5709 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5710 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5712 ca355955 2019-07-12 stsp goto done;
5714 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5716 ca355955 2019-07-12 stsp goto done;
5718 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5720 818c7501 2019-07-11 stsp goto done;
5722 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5723 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5724 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5725 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5726 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5727 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5728 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5729 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5730 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5732 1f1abb7e 2019-08-08 stsp goto sync;
5734 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5735 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5737 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5738 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5739 ca355955 2019-07-12 stsp err = sync_err;
5741 818c7501 2019-07-11 stsp got_ref_close(resolved);
5742 a3a2faf2 2019-07-12 stsp free(tree_id);
5743 818c7501 2019-07-11 stsp free(commit_id);
5744 0ebf8283 2019-07-24 stsp if (fileindex)
5745 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5746 0ebf8283 2019-07-24 stsp free(fileindex_path);
5748 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5749 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5750 0ebf8283 2019-07-24 stsp err = unlockerr;
5751 0ebf8283 2019-07-24 stsp return err;
5754 0ebf8283 2019-07-24 stsp const struct got_error *
5755 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5756 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5757 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5758 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5760 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5761 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5762 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5763 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5764 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5765 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5766 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5767 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5769 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5770 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5771 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5772 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5774 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5776 0ebf8283 2019-07-24 stsp return err;
5778 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5780 0ebf8283 2019-07-24 stsp goto done;
5782 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5783 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5784 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5787 0ebf8283 2019-07-24 stsp goto done;
5789 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5791 0ebf8283 2019-07-24 stsp goto done;
5793 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5795 0ebf8283 2019-07-24 stsp goto done;
5797 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5798 0ebf8283 2019-07-24 stsp worktree);
5800 0ebf8283 2019-07-24 stsp goto done;
5802 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5805 0ebf8283 2019-07-24 stsp goto done;
5807 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5809 0ebf8283 2019-07-24 stsp goto done;
5811 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5813 0ebf8283 2019-07-24 stsp goto done;
5815 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5816 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5818 0ebf8283 2019-07-24 stsp goto done;
5819 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5821 0ebf8283 2019-07-24 stsp goto done;
5822 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5823 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5824 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5825 0ebf8283 2019-07-24 stsp goto done;
5828 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5829 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5831 0ebf8283 2019-07-24 stsp goto done;
5832 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5834 0ebf8283 2019-07-24 stsp goto done;
5836 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5838 0ebf8283 2019-07-24 stsp goto done;
5840 0ebf8283 2019-07-24 stsp free(fileindex_path);
5841 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5842 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5843 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5844 0ebf8283 2019-07-24 stsp if (wt_branch)
5845 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5846 0ebf8283 2019-07-24 stsp if (err) {
5847 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5848 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5849 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5851 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5852 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5853 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5855 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5856 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5857 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5858 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5860 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5862 0ebf8283 2019-07-24 stsp return err;
5865 0ebf8283 2019-07-24 stsp const struct got_error *
5866 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5867 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5869 3e3a69f1 2019-07-25 stsp if (fileindex)
5870 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5871 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5874 0ebf8283 2019-07-24 stsp const struct got_error *
5875 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5876 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5878 0ebf8283 2019-07-24 stsp const struct got_error *err;
5879 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5881 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5883 0ebf8283 2019-07-24 stsp return err;
5885 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5886 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5887 0ebf8283 2019-07-24 stsp return NULL;
5890 0ebf8283 2019-07-24 stsp const struct got_error *
5891 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5892 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5893 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5894 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5896 0ebf8283 2019-07-24 stsp const struct got_error *err;
5897 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5898 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5899 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5900 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5901 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5902 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5904 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5905 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5906 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5907 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5909 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5911 3e3a69f1 2019-07-25 stsp return err;
5913 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5915 f032f1f7 2019-08-04 stsp goto done;
5917 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5918 f032f1f7 2019-08-04 stsp &have_staged_files);
5919 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5920 f032f1f7 2019-08-04 stsp goto done;
5921 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5922 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5923 3e3a69f1 2019-07-25 stsp goto done;
5926 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5928 f032f1f7 2019-08-04 stsp goto done;
5930 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5932 0ebf8283 2019-07-24 stsp goto done;
5934 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5936 0ebf8283 2019-07-24 stsp goto done;
5938 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5939 0ebf8283 2019-07-24 stsp worktree);
5941 0ebf8283 2019-07-24 stsp goto done;
5943 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5945 0ebf8283 2019-07-24 stsp goto done;
5947 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5949 0ebf8283 2019-07-24 stsp goto done;
5950 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5952 0ebf8283 2019-07-24 stsp goto done;
5954 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5956 0ebf8283 2019-07-24 stsp goto done;
5957 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5959 0ebf8283 2019-07-24 stsp goto done;
5961 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5963 0ebf8283 2019-07-24 stsp goto done;
5965 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5966 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5967 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5968 0ebf8283 2019-07-24 stsp if (commit_ref)
5969 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5970 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5971 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5972 0ebf8283 2019-07-24 stsp if (err) {
5973 0ebf8283 2019-07-24 stsp free(*commit_id);
5974 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5975 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5976 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5977 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5978 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5979 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5981 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5982 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5983 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5985 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5987 0ebf8283 2019-07-24 stsp return err;
5990 0ebf8283 2019-07-24 stsp static const struct got_error *
5991 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5993 0ebf8283 2019-07-24 stsp const struct got_error *err;
5994 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5995 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5997 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5999 0ebf8283 2019-07-24 stsp goto done;
6000 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6002 0ebf8283 2019-07-24 stsp goto done;
6004 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6005 0ebf8283 2019-07-24 stsp worktree);
6007 0ebf8283 2019-07-24 stsp goto done;
6008 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6010 0ebf8283 2019-07-24 stsp goto done;
6012 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6014 0ebf8283 2019-07-24 stsp goto done;
6015 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6017 0ebf8283 2019-07-24 stsp goto done;
6019 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6021 0ebf8283 2019-07-24 stsp goto done;
6022 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6024 0ebf8283 2019-07-24 stsp goto done;
6026 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6027 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6028 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6029 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6030 0ebf8283 2019-07-24 stsp return err;
6033 0ebf8283 2019-07-24 stsp const struct got_error *
6034 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
6035 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6036 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
6037 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6039 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6040 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6041 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6042 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6043 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6045 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6047 0ebf8283 2019-07-24 stsp return err;
6049 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6050 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6052 0ebf8283 2019-07-24 stsp goto done;
6054 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6056 0ebf8283 2019-07-24 stsp goto done;
6058 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6060 0ebf8283 2019-07-24 stsp goto done;
6062 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6063 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6065 0ebf8283 2019-07-24 stsp goto done;
6067 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6069 0ebf8283 2019-07-24 stsp goto done;
6071 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6073 0ebf8283 2019-07-24 stsp goto done;
6075 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6076 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6077 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6078 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6079 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6080 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6081 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6082 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6083 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6085 1f1abb7e 2019-08-08 stsp goto sync;
6087 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6088 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6090 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6091 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6092 0ebf8283 2019-07-24 stsp err = sync_err;
6094 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6095 0ebf8283 2019-07-24 stsp free(tree_id);
6096 818c7501 2019-07-11 stsp free(fileindex_path);
6098 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6099 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6100 818c7501 2019-07-11 stsp err = unlockerr;
6101 818c7501 2019-07-11 stsp return err;
6104 0ebf8283 2019-07-24 stsp const struct got_error *
6105 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6106 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6107 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6109 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
6110 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6111 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6113 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6115 0ebf8283 2019-07-24 stsp return err;
6117 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6118 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
6120 0ebf8283 2019-07-24 stsp goto done;
6122 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
6124 0ebf8283 2019-07-24 stsp goto done;
6126 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
6128 0ebf8283 2019-07-24 stsp goto done;
6130 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6132 0ebf8283 2019-07-24 stsp goto done;
6134 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6136 3e3a69f1 2019-07-25 stsp if (fileindex)
6137 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6138 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
6139 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6140 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6141 0ebf8283 2019-07-24 stsp err = unlockerr;
6142 0ebf8283 2019-07-24 stsp return err;
6145 0ebf8283 2019-07-24 stsp const struct got_error *
6146 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6147 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6149 0ebf8283 2019-07-24 stsp const struct got_error *err;
6150 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6152 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6154 0ebf8283 2019-07-24 stsp return err;
6156 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6158 0ebf8283 2019-07-24 stsp goto done;
6160 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6162 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6163 2822a352 2019-10-15 stsp return err;
6166 2822a352 2019-10-15 stsp const struct got_error *
6167 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6168 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6169 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
6170 2822a352 2019-10-15 stsp struct got_repository *repo)
6172 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
6173 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6174 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
6176 2822a352 2019-10-15 stsp *fileindex = NULL;
6177 2822a352 2019-10-15 stsp *branch_ref = NULL;
6178 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6180 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
6182 2822a352 2019-10-15 stsp return err;
6184 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6185 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6186 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
6187 2822a352 2019-10-15 stsp "update -b or different branch name required");
6188 2822a352 2019-10-15 stsp goto done;
6191 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6193 2822a352 2019-10-15 stsp goto done;
6195 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
6196 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
6197 2822a352 2019-10-15 stsp ok_arg.repo = repo;
6198 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6201 2822a352 2019-10-15 stsp goto done;
6203 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
6205 2822a352 2019-10-15 stsp goto done;
6207 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
6208 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
6210 2822a352 2019-10-15 stsp if (err) {
6211 2822a352 2019-10-15 stsp if (*branch_ref) {
6212 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
6213 2822a352 2019-10-15 stsp *branch_ref = NULL;
6215 2822a352 2019-10-15 stsp if (*base_branch_ref) {
6216 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
6217 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6219 2822a352 2019-10-15 stsp if (*fileindex) {
6220 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
6221 2822a352 2019-10-15 stsp *fileindex = NULL;
6223 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
6225 0cb83759 2019-08-03 stsp return err;
6228 2822a352 2019-10-15 stsp const struct got_error *
6229 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
6230 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6231 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6232 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6233 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6235 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6236 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6237 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6239 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6241 2822a352 2019-10-15 stsp goto done;
6243 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6245 2822a352 2019-10-15 stsp goto done;
6247 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6248 2822a352 2019-10-15 stsp worktree->path_prefix);
6250 2822a352 2019-10-15 stsp goto done;
6252 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6254 2822a352 2019-10-15 stsp goto done;
6256 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6257 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6259 2822a352 2019-10-15 stsp goto sync;
6261 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6263 2822a352 2019-10-15 stsp goto sync;
6265 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
6267 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6268 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
6269 2822a352 2019-10-15 stsp err = sync_err;
6272 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
6273 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6274 2822a352 2019-10-15 stsp err = unlockerr;
6275 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6277 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
6278 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6279 2822a352 2019-10-15 stsp err = unlockerr;
6280 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6282 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
6283 2822a352 2019-10-15 stsp free(fileindex_path);
6284 2822a352 2019-10-15 stsp free(tree_id);
6286 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6287 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6288 2822a352 2019-10-15 stsp err = unlockerr;
6289 2822a352 2019-10-15 stsp return err;
6292 2822a352 2019-10-15 stsp const struct got_error *
6293 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
6294 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6295 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6297 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
6299 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
6301 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
6303 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
6304 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6305 8b692cd0 2019-10-21 stsp err = unlockerr;
6306 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6308 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
6309 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6310 8b692cd0 2019-10-21 stsp err = unlockerr;
6311 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6313 8b692cd0 2019-10-21 stsp return err;
6316 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
6317 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
6318 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6319 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6320 2db2652d 2019-08-07 stsp struct got_repository *repo;
6321 2db2652d 2019-08-07 stsp int have_changes;
6324 2db2652d 2019-08-07 stsp const struct got_error *
6325 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
6326 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6327 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6328 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6330 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
6331 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
6332 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
6333 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
6334 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
6335 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
6337 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
6338 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
6339 8b13ce36 2019-08-08 stsp return NULL;
6340 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6341 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
6343 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6344 735ef5ac 2019-08-03 stsp if (ie == NULL)
6345 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6347 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6348 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6349 735ef5ac 2019-08-03 stsp relpath) == -1)
6350 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
6352 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
6353 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
6354 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6355 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
6358 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
6359 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6360 3aa5969e 2019-08-06 stsp goto done;
6361 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
6362 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
6363 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
6364 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6365 735ef5ac 2019-08-03 stsp goto done;
6368 2db2652d 2019-08-07 stsp a->have_changes = 1;
6370 735ef5ac 2019-08-03 stsp p = in_repo_path;
6371 735ef5ac 2019-08-03 stsp while (p[0] == '/')
6373 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
6374 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
6375 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
6377 735ef5ac 2019-08-03 stsp free(in_repo_path);
6378 dc424a06 2019-08-07 stsp return err;
6381 2db2652d 2019-08-07 stsp struct stage_path_arg {
6382 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6383 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6384 2db2652d 2019-08-07 stsp struct got_repository *repo;
6385 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
6386 2db2652d 2019-08-07 stsp void *status_arg;
6387 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
6388 2db2652d 2019-08-07 stsp void *patch_arg;
6389 7b5dc508 2019-10-28 stsp int staged_something;
6392 2db2652d 2019-08-07 stsp static const struct got_error *
6393 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
6394 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6395 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6396 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6398 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
6399 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
6400 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
6401 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
6402 0cb83759 2019-08-03 stsp uint32_t stage;
6403 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
6405 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
6406 8b13ce36 2019-08-08 stsp return NULL;
6408 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6409 d3e7c587 2019-08-03 stsp if (ie == NULL)
6410 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6412 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6413 2db2652d 2019-08-07 stsp relpath)== -1)
6414 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
6416 0cb83759 2019-08-03 stsp switch (status) {
6417 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
6418 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
6419 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6420 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
6421 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6422 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6423 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
6426 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
6429 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
6430 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
6431 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
6432 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
6433 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
6437 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
6438 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
6441 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6442 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6443 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6444 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
6446 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
6447 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6448 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6449 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6451 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6452 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
6453 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
6455 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
6456 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
6458 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6459 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6460 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
6461 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
6464 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6466 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6467 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6471 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
6472 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6473 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6474 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6476 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6477 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6480 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
6482 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
6483 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6485 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
6486 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
6489 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6493 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
6494 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
6495 dc424a06 2019-08-07 stsp free(path_content);
6496 2db2652d 2019-08-07 stsp free(ondisk_path);
6497 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
6498 0ebf8283 2019-07-24 stsp return err;
6501 0cb83759 2019-08-03 stsp const struct got_error *
6502 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
6503 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
6504 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
6505 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6506 1e71573e 2019-08-03 stsp struct got_repository *repo)
6508 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6509 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
6510 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6511 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
6512 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
6513 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
6514 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
6515 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
6517 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6519 0cb83759 2019-08-03 stsp return err;
6521 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
6522 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
6524 735ef5ac 2019-08-03 stsp goto done;
6525 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6527 735ef5ac 2019-08-03 stsp goto done;
6528 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6530 0cb83759 2019-08-03 stsp goto done;
6532 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
6533 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
6534 2db2652d 2019-08-07 stsp oka.worktree = worktree;
6535 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
6536 2db2652d 2019-08-07 stsp oka.repo = repo;
6537 2db2652d 2019-08-07 stsp oka.have_changes = 0;
6538 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6539 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6540 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
6542 735ef5ac 2019-08-03 stsp goto done;
6544 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
6545 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6546 2db2652d 2019-08-07 stsp goto done;
6549 2db2652d 2019-08-07 stsp spa.worktree = worktree;
6550 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
6551 2db2652d 2019-08-07 stsp spa.repo = repo;
6552 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
6553 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
6554 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
6555 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
6556 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
6557 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6558 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6559 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
6561 2db2652d 2019-08-07 stsp goto done;
6563 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
6564 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6565 7b5dc508 2019-10-28 stsp goto done;
6568 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6569 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
6570 0cb83759 2019-08-03 stsp err = sync_err;
6572 735ef5ac 2019-08-03 stsp if (head_ref)
6573 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
6574 735ef5ac 2019-08-03 stsp free(head_commit_id);
6575 0cb83759 2019-08-03 stsp free(fileindex_path);
6576 0cb83759 2019-08-03 stsp if (fileindex)
6577 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
6578 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6579 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
6580 0cb83759 2019-08-03 stsp err = unlockerr;
6581 0cb83759 2019-08-03 stsp return err;
6584 ad493afc 2019-08-03 stsp struct unstage_path_arg {
6585 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
6586 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
6587 ad493afc 2019-08-03 stsp struct got_repository *repo;
6588 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
6589 ad493afc 2019-08-03 stsp void *progress_arg;
6590 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
6591 2e1f37b0 2019-08-08 stsp void *patch_arg;
6594 2e1f37b0 2019-08-08 stsp static const struct got_error *
6595 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
6596 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
6597 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
6598 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
6599 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
6601 2e1f37b0 2019-08-08 stsp const struct got_error *err;
6602 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
6603 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6604 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6605 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
6606 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
6607 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
6608 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
6609 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
6610 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6611 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
6613 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6614 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6616 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
6618 2e1f37b0 2019-08-08 stsp return err;
6619 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6621 2e1f37b0 2019-08-08 stsp goto done;
6623 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6625 2e1f37b0 2019-08-08 stsp goto done;
6627 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6629 2e1f37b0 2019-08-08 stsp goto done;
6631 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6633 2e1f37b0 2019-08-08 stsp goto done;
6635 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6637 2e1f37b0 2019-08-08 stsp goto done;
6639 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6641 2e1f37b0 2019-08-08 stsp goto done;
6643 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
6644 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
6645 2e1f37b0 2019-08-08 stsp goto done;
6648 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
6649 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
6650 2e1f37b0 2019-08-08 stsp goto done;
6653 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
6654 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6656 2e1f37b0 2019-08-08 stsp goto done;
6658 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
6659 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
6661 2e1f37b0 2019-08-08 stsp goto done;
6662 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
6663 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
6665 2e1f37b0 2019-08-08 stsp goto done;
6667 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
6668 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
6669 2e1f37b0 2019-08-08 stsp goto done;
6671 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
6672 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
6673 2e1f37b0 2019-08-08 stsp goto done;
6675 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6676 2e1f37b0 2019-08-08 stsp int choice;
6677 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
6678 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
6679 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
6680 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
6682 2e1f37b0 2019-08-08 stsp goto done;
6683 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
6684 2e1f37b0 2019-08-08 stsp have_content = 1;
6686 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
6687 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
6690 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
6691 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6692 f1e81a05 2019-08-10 stsp outfile, rejectfile);
6694 2e1f37b0 2019-08-08 stsp free(label1);
6696 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
6697 2e1f37b0 2019-08-08 stsp if (staged_blob)
6698 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
6699 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
6700 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
6701 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
6702 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
6703 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
6704 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
6705 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6706 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
6707 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
6708 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
6709 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
6710 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
6711 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
6712 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
6713 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
6714 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6715 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
6716 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
6717 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6719 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
6720 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
6721 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
6722 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6723 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
6724 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
6725 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6727 2e1f37b0 2019-08-08 stsp free(args);
6729 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
6732 2e1f37b0 2019-08-08 stsp if (changes)
6733 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
6734 2e1f37b0 2019-08-08 stsp free(path1);
6735 2e1f37b0 2019-08-08 stsp free(path2);
6736 2e1f37b0 2019-08-08 stsp return err;
6739 ad493afc 2019-08-03 stsp static const struct got_error *
6740 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
6741 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
6742 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6743 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6745 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
6746 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
6747 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
6748 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6749 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
6750 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
6751 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
6752 ad493afc 2019-08-03 stsp int local_changes_subsumed;
6753 9bc94a15 2019-08-03 stsp struct stat sb;
6755 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
6756 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
6757 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
6758 2e1f37b0 2019-08-08 stsp return NULL;
6760 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6761 ad493afc 2019-08-03 stsp if (ie == NULL)
6762 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6764 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6766 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
6768 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
6769 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
6771 f69721c3 2019-10-21 stsp goto done;
6772 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6773 f69721c3 2019-10-21 stsp id_str) == -1) {
6774 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
6775 f69721c3 2019-10-21 stsp goto done;
6778 ad493afc 2019-08-03 stsp switch (staged_status) {
6779 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
6780 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
6781 ad493afc 2019-08-03 stsp blob_id, 8192);
6784 ad493afc 2019-08-03 stsp /* fall through */
6785 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
6786 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6787 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
6788 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6789 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6790 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6793 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6796 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6797 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6798 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6799 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6800 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6801 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6803 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6804 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6805 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6806 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6810 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6811 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6812 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6814 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6815 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6816 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6817 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
6818 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
6819 f69721c3 2019-10-21 stsp a->progress_arg);
6820 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6821 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6822 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6823 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6824 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6827 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6828 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6831 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6832 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6833 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6834 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6835 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6836 ad493afc 2019-08-03 stsp if (err == NULL)
6837 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6838 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6840 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6841 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6842 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6843 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6844 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6847 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6849 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6850 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6854 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6855 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
6856 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
6859 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6863 ad493afc 2019-08-03 stsp free(ondisk_path);
6864 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6865 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6866 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6867 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6868 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6869 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6870 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6871 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6872 ad493afc 2019-08-03 stsp if (blob_base)
6873 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6874 ad493afc 2019-08-03 stsp if (blob_staged)
6875 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6876 f69721c3 2019-10-21 stsp free(id_str);
6877 f69721c3 2019-10-21 stsp free(label_orig);
6878 ad493afc 2019-08-03 stsp return err;
6881 ad493afc 2019-08-03 stsp const struct got_error *
6882 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6883 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6884 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6885 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6886 ad493afc 2019-08-03 stsp struct got_repository *repo)
6888 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6889 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6890 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6891 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6892 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6894 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6896 ad493afc 2019-08-03 stsp return err;
6898 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6900 ad493afc 2019-08-03 stsp goto done;
6902 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6903 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6904 ad493afc 2019-08-03 stsp upa.repo = repo;
6905 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6906 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6907 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6908 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6909 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6910 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6911 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
6913 ad493afc 2019-08-03 stsp goto done;
6916 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6917 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6918 ad493afc 2019-08-03 stsp err = sync_err;
6920 ad493afc 2019-08-03 stsp free(fileindex_path);
6921 ad493afc 2019-08-03 stsp if (fileindex)
6922 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6923 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6924 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6925 ad493afc 2019-08-03 stsp err = unlockerr;
6926 ad493afc 2019-08-03 stsp return err;
