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 ddcd8544 2019-03-11 stsp err = got_error(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 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
899 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
900 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
901 13d9040b 2019-03-27 stsp int update_timestamps)
903 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
905 13d9040b 2019-03-27 stsp if (ie == NULL)
906 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
908 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
909 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
910 13d9040b 2019-03-27 stsp update_timestamps);
912 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
913 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&new_ie, path);
915 3969253a 2020-03-07 stsp return err;
916 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(new_ie, ondisk_path,
917 3969253a 2020-03-07 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
919 3969253a 2020-03-07 stsp got_fileindex_entry_free(new_ie);
920 3969253a 2020-03-07 stsp return err;
922 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, new_ie);
924 3969253a 2020-03-07 stsp got_fileindex_entry_free(new_ie);
926 13d9040b 2019-03-27 stsp return err;
929 1ebedb77 2019-10-19 stsp static mode_t
930 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
932 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
934 1ebedb77 2019-10-19 stsp if (executable) {
935 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
936 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
937 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
938 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
939 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
940 1ebedb77 2019-10-19 stsp return st_mode | xbits;
943 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
946 13d9040b 2019-03-27 stsp static const struct got_error *
947 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
948 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
949 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
950 4b55f459 2019-09-08 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 507dc3bb 2018-12-29 stsp int fd = -1;
955 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
956 507dc3bb 2018-12-29 stsp int update = 0;
957 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
959 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
960 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
961 9d31a1d8 2018-03-11 stsp if (fd == -1) {
962 21908da4 2019-01-13 stsp if (errno == ENOENT) {
963 21908da4 2019-01-13 stsp char *parent = dirname(path);
964 21908da4 2019-01-13 stsp if (parent == NULL)
965 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
966 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
968 21908da4 2019-01-13 stsp return err;
969 21908da4 2019-01-13 stsp fd = open(ondisk_path,
970 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
971 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
972 21908da4 2019-01-13 stsp if (fd == -1)
973 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
974 230a42bd 2019-05-11 jcs ondisk_path);
975 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
976 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
977 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
978 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
981 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
982 507dc3bb 2018-12-29 stsp ondisk_path);
985 507dc3bb 2018-12-29 stsp update = 1;
988 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
991 a378724f 2019-02-10 stsp if (restoring_missing_file)
992 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
993 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
994 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
996 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
997 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1001 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1003 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1004 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1007 9d31a1d8 2018-03-11 stsp if (len > 0) {
1008 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1009 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1010 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1011 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1012 b87c6f83 2018-12-24 stsp goto done;
1013 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1014 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1015 b87c6f83 2018-12-24 stsp goto done;
1017 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1019 9d31a1d8 2018-03-11 stsp } while (len != 0);
1021 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1022 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1023 816dc654 2019-02-16 stsp goto done;
1026 507dc3bb 2018-12-29 stsp if (update) {
1027 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1028 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1029 230a42bd 2019-05-11 jcs ondisk_path);
1030 2a57020b 2019-02-20 stsp unlink(tmppath);
1031 68ed9ba5 2019-02-10 stsp goto done;
1035 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1036 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1037 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1038 1ebedb77 2019-10-19 stsp goto done;
1042 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1043 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1044 507dc3bb 2018-12-29 stsp free(tmppath);
1045 6353ad76 2019-02-08 stsp return err;
1048 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1049 6353ad76 2019-02-08 stsp static const struct got_error *
1050 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1052 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1053 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1054 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1055 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1056 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1058 7154f6ce 2019-03-27 stsp int i = 0;
1059 7154f6ce 2019-03-27 stsp char *line;
1060 7154f6ce 2019-03-27 stsp size_t len;
1061 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1063 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1064 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1065 7154f6ce 2019-03-27 stsp if (line == NULL) {
1066 7154f6ce 2019-03-27 stsp if (feof(f))
1068 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1072 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1073 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1075 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1081 7154f6ce 2019-03-27 stsp return err;
1084 e2b1e152 2019-07-13 stsp static int
1085 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1087 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1088 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1091 1ebedb77 2019-10-19 stsp static int
1092 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1094 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1095 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1096 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1097 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1098 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1099 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1102 c363b2c1 2019-08-03 stsp static unsigned char
1103 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1105 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1106 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1107 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1108 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1109 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1110 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1111 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1113 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1117 7154f6ce 2019-03-27 stsp static const struct got_error *
1118 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1119 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1120 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1122 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1123 6353ad76 2019-02-08 stsp struct got_object_id id;
1124 6353ad76 2019-02-08 stsp size_t hdrlen;
1125 1338848f 2019-12-13 stsp int fd = -1;
1126 6353ad76 2019-02-08 stsp FILE *f = NULL;
1127 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1128 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1129 6353ad76 2019-02-08 stsp size_t flen, blen;
1130 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1132 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1135 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1136 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1137 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1139 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1140 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1141 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1142 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1143 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1145 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1146 882ef1b9 2019-12-13 stsp goto done;
1148 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1149 3d35a492 2019-12-13 stsp goto done;
1152 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1153 7f91a133 2019-12-13 stsp if (fd == -1 && errno != ENOENT)
1154 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1155 3d35a492 2019-12-13 stsp if (fd == -1 || fstat(fd, sb) == -1) {
1156 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1157 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1158 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1160 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1161 3d35a492 2019-12-13 stsp goto done;
1163 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1164 1338848f 2019-12-13 stsp goto done;
1168 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1169 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1170 1338848f 2019-12-13 stsp goto done;
1173 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1174 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1175 1338848f 2019-12-13 stsp goto done;
1176 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1177 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1178 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1179 1338848f 2019-12-13 stsp goto done;
1182 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1183 1338848f 2019-12-13 stsp goto done;
1185 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1186 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1187 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1189 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1191 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1193 1338848f 2019-12-13 stsp goto done;
1195 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1196 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1197 ab0d4361 2019-12-13 stsp if (fd == -1) {
1198 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1199 ab0d4361 2019-12-13 stsp goto done;
1203 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1204 6353ad76 2019-02-08 stsp if (f == NULL) {
1205 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1206 6353ad76 2019-02-08 stsp goto done;
1209 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1211 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1212 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1214 7154f6ce 2019-03-27 stsp goto done;
1215 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1216 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1217 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1218 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1219 7154f6ce 2019-03-27 stsp goto done;
1221 6353ad76 2019-02-08 stsp if (blen == 0) {
1222 6353ad76 2019-02-08 stsp if (flen != 0)
1223 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1225 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1226 6353ad76 2019-02-08 stsp if (blen != 0)
1227 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1229 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1230 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1231 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1232 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1236 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1239 6353ad76 2019-02-08 stsp hdrlen = 0;
1242 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1243 7154f6ce 2019-03-27 stsp rewind(f);
1244 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1245 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1246 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1249 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1250 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1251 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1252 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1253 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1254 9d31a1d8 2018-03-11 stsp return err;
1258 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1259 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1261 e2b1e152 2019-07-13 stsp static const struct got_error *
1262 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1263 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1265 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1266 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1267 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1269 e2b1e152 2019-07-13 stsp return NULL;
1272 9d31a1d8 2018-03-11 stsp static const struct got_error *
1273 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1274 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1275 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1276 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1277 0584f854 2019-04-06 stsp void *progress_arg)
1279 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1280 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1281 6353ad76 2019-02-08 stsp char *ondisk_path;
1282 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1283 b8f41171 2019-02-10 stsp struct stat sb;
1285 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1286 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1289 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1290 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1291 a76c42e6 2019-08-03 stsp goto done;
1293 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1296 abb4604f 2019-07-27 stsp goto done;
1297 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1298 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1300 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1302 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1303 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1304 b8f41171 2019-02-10 stsp goto done;
1307 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1308 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1309 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1310 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1311 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1312 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1314 e2b1e152 2019-07-13 stsp goto done;
1315 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1317 6353ad76 2019-02-08 stsp goto done;
1319 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1320 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1321 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1322 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1323 b8f41171 2019-02-10 stsp goto done;
1327 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1329 6353ad76 2019-02-08 stsp goto done;
1331 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1332 234035bc 2019-06-01 stsp int update_timestamps;
1333 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1334 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1335 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1336 234035bc 2019-06-01 stsp struct got_object_id id2;
1337 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1338 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1340 f69721c3 2019-10-21 stsp goto done;
1342 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1343 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1344 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1345 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1346 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1347 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1348 f69721c3 2019-10-21 stsp goto done;
1350 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1351 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1352 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1353 234035bc 2019-06-01 stsp goto done;
1356 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1357 f69721c3 2019-10-21 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1358 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1359 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1360 f69721c3 2019-10-21 stsp free(label_orig);
1361 234035bc 2019-06-01 stsp if (blob2)
1362 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1364 909d120e 2019-09-22 stsp goto done;
1366 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1367 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1368 234035bc 2019-06-01 stsp * unmodified files again.
1370 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1371 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1372 234035bc 2019-06-01 stsp update_timestamps);
1373 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1374 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1375 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1376 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1377 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1379 1ee397ad 2019-07-12 stsp goto done;
1380 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1381 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1383 13d9040b 2019-03-27 stsp goto done;
1385 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1386 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1387 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1389 13d9040b 2019-03-27 stsp goto done;
1390 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1391 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1393 13d9040b 2019-03-27 stsp goto done;
1395 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1397 6353ad76 2019-02-08 stsp free(ondisk_path);
1398 8da9e5f4 2019-01-12 stsp return err;
1401 90285c3b 2019-01-08 stsp static const struct got_error *
1402 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1404 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1405 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1407 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1408 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1410 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1411 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1412 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1414 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1415 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1416 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1417 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1418 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1422 90285c3b 2019-01-08 stsp parent = dirname(parent);
1425 90285c3b 2019-01-08 stsp free(ondisk_path);
1426 90285c3b 2019-01-08 stsp return err;
1429 708d8e67 2019-03-27 stsp static const struct got_error *
1430 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1431 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1432 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1434 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1435 708d8e67 2019-03-27 stsp unsigned char status;
1436 708d8e67 2019-03-27 stsp struct stat sb;
1437 708d8e67 2019-03-27 stsp char *ondisk_path;
1439 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1440 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1442 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1444 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1446 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
1448 708d8e67 2019-03-27 stsp return err;
1450 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1451 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1452 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1454 1ee397ad 2019-07-12 stsp return err;
1456 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1457 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1459 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1462 708d8e67 2019-03-27 stsp return err;
1464 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1466 1ee397ad 2019-07-12 stsp return err;
1467 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1468 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1470 fc6346c4 2019-03-27 stsp return err;
1472 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1475 fc6346c4 2019-03-27 stsp return err;
1478 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1479 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1480 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1481 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1482 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1483 8da9e5f4 2019-01-12 stsp void *progress_arg;
1484 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1485 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1488 512f0d0e 2019-01-02 stsp static const struct got_error *
1489 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1490 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1492 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1494 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1495 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1497 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1498 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1501 8da9e5f4 2019-01-12 stsp static const struct got_error *
1502 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1504 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1506 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1507 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1509 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1510 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1513 9d31a1d8 2018-03-11 stsp static const struct got_error *
1514 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1516 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1517 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1518 8da9e5f4 2019-01-12 stsp char *path;
1520 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1521 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1523 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1524 63c5ca5d 2019-08-24 stsp return NULL;
1526 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1527 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1529 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1531 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1532 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1534 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1535 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1537 8da9e5f4 2019-01-12 stsp free(path);
1538 0cd1c46a 2019-03-11 stsp return err;
1541 818c7501 2019-07-11 stsp static const struct got_error *
1542 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1544 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1545 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1546 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1548 517bab73 2019-03-11 stsp *refname = NULL;
1550 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1551 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1552 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1554 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1556 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1557 0647c563 2019-03-11 stsp *refname = NULL;
1559 517bab73 2019-03-11 stsp free(uuidstr);
1560 517bab73 2019-03-11 stsp return err;
1563 818c7501 2019-07-11 stsp const struct got_error *
1564 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1566 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1569 818c7501 2019-07-11 stsp static const struct got_error *
1570 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1572 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1573 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1576 818c7501 2019-07-11 stsp static const struct got_error *
1577 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1579 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1582 818c7501 2019-07-11 stsp static const struct got_error *
1583 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1585 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1586 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1589 818c7501 2019-07-11 stsp static const struct got_error *
1590 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1592 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1593 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1596 0ebf8283 2019-07-24 stsp static const struct got_error *
1597 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1599 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1600 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1603 0ebf8283 2019-07-24 stsp static const struct got_error *
1604 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1606 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1607 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1610 0ebf8283 2019-07-24 stsp static const struct got_error *
1611 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1613 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1614 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1617 0ebf8283 2019-07-24 stsp static const struct got_error *
1618 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1620 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1621 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1624 0ebf8283 2019-07-24 stsp const struct got_error *
1625 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1626 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1628 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1629 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1630 0ebf8283 2019-07-24 stsp *path = NULL;
1631 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1633 0ebf8283 2019-07-24 stsp return NULL;
1637 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1638 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1640 517bab73 2019-03-11 stsp static const struct got_error *
1641 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1643 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1644 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1645 517bab73 2019-03-11 stsp char *refname;
1647 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1649 517bab73 2019-03-11 stsp return err;
1651 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1653 0cd1c46a 2019-03-11 stsp goto done;
1655 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1657 0cd1c46a 2019-03-11 stsp free(refname);
1659 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1660 3e3a69f1 2019-07-25 stsp return err;
1663 3e3a69f1 2019-07-25 stsp static const struct got_error *
1664 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1666 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1668 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1669 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1670 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1671 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1673 9d31a1d8 2018-03-11 stsp return err;
1677 ebf99748 2019-05-09 stsp static const struct got_error *
1678 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1679 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
1681 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1682 ebf99748 2019-05-09 stsp FILE *index = NULL;
1684 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1685 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1686 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1687 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1689 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1691 ebf99748 2019-05-09 stsp goto done;
1693 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1694 ebf99748 2019-05-09 stsp if (index == NULL) {
1695 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1696 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1698 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1699 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1700 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1703 ebf99748 2019-05-09 stsp if (err) {
1704 ebf99748 2019-05-09 stsp free(*fileindex_path);
1705 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1706 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1707 ebf99748 2019-05-09 stsp *fileindex = NULL;
1709 ebf99748 2019-05-09 stsp return err;
1712 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1713 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1714 c932eeeb 2019-05-22 stsp const char *path;
1715 c932eeeb 2019-05-22 stsp size_t path_len;
1716 c932eeeb 2019-05-22 stsp const char *entry_name;
1717 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1718 a484d721 2019-06-10 stsp void *progress_arg;
1721 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1722 c932eeeb 2019-05-22 stsp static const struct got_error *
1723 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1725 1ee397ad 2019-07-12 stsp const struct got_error *err;
1726 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1728 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1729 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1730 c932eeeb 2019-05-22 stsp return NULL;
1731 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1732 102ff934 2019-06-11 stsp return NULL;
1734 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1735 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1736 c932eeeb 2019-05-22 stsp return NULL;
1738 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1739 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1740 edd02c5e 2019-07-11 stsp ie->path);
1742 1ee397ad 2019-07-12 stsp return err;
1744 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1745 c932eeeb 2019-05-22 stsp return NULL;
1748 9c6338c4 2019-06-02 stsp static const struct got_error *
1749 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1751 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1752 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1753 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1754 867630bb 2020-01-17 stsp struct timespec timeout;
1756 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1757 9c6338c4 2019-06-02 stsp fileindex_path);
1759 9c6338c4 2019-06-02 stsp goto done;
1761 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1763 9c6338c4 2019-06-02 stsp goto done;
1765 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1766 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1767 9c6338c4 2019-06-02 stsp fileindex_path);
1768 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1772 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
1773 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
1774 867630bb 2020-01-17 stsp * was recorded in the file index.
1776 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
1777 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
1778 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
1780 9c6338c4 2019-06-02 stsp if (new_index)
1781 9c6338c4 2019-06-02 stsp fclose(new_index);
1782 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1783 9c6338c4 2019-06-02 stsp return err;
1786 6ced4176 2019-07-12 stsp static const struct got_error *
1787 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1788 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1789 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1791 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1792 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1793 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1794 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1796 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1797 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1798 6ced4176 2019-07-12 stsp *tree_id = NULL;
1800 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1801 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1802 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1803 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1804 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1805 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1806 6ced4176 2019-07-12 stsp goto done;
1808 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1809 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1811 6ced4176 2019-07-12 stsp goto done;
1812 6ced4176 2019-07-12 stsp return NULL;
1815 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1817 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1818 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1819 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1820 6ced4176 2019-07-12 stsp goto done;
1823 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1824 6ced4176 2019-07-12 stsp in_repo_path);
1826 6ced4176 2019-07-12 stsp goto done;
1828 6ced4176 2019-07-12 stsp free(in_repo_path);
1829 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1831 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1833 6ced4176 2019-07-12 stsp goto done;
1835 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1836 6ced4176 2019-07-12 stsp /* Check out a single file. */
1837 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1838 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1839 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1840 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1841 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1842 6ced4176 2019-07-12 stsp goto done;
1844 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1845 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1846 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1847 6ced4176 2019-07-12 stsp goto done;
1850 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1851 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1853 6ced4176 2019-07-12 stsp return err;
1854 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1855 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1856 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1857 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1858 6ced4176 2019-07-12 stsp goto done;
1861 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1862 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1864 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1865 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1866 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1867 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1868 6ced4176 2019-07-12 stsp goto done;
1870 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1871 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1872 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1873 6ced4176 2019-07-12 stsp goto done;
1878 6ced4176 2019-07-12 stsp free(in_repo_path);
1879 6ced4176 2019-07-12 stsp if (err) {
1880 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1881 6ced4176 2019-07-12 stsp free(*tree_relpath);
1882 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1883 6ced4176 2019-07-12 stsp free(*tree_id);
1884 6ced4176 2019-07-12 stsp *tree_id = NULL;
1886 07ed472d 2019-07-12 stsp return err;
1889 07ed472d 2019-07-12 stsp static const struct got_error *
1890 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1891 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1892 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1893 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1895 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1896 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1897 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1898 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1899 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1901 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1902 7f47418f 2019-12-20 stsp if (err) {
1903 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
1904 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
1905 7f47418f 2019-12-20 stsp goto done;
1906 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
1907 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
1909 7f47418f 2019-12-20 stsp return err;
1912 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1913 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1915 07ed472d 2019-07-12 stsp goto done;
1917 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1919 07ed472d 2019-07-12 stsp goto done;
1921 07ed472d 2019-07-12 stsp if (entry_name &&
1922 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1923 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1924 07ed472d 2019-07-12 stsp goto done;
1927 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1928 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1929 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1930 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1931 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1932 07ed472d 2019-07-12 stsp arg.repo = repo;
1933 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1934 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1935 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1936 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1937 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1938 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1941 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1942 07ed472d 2019-07-12 stsp if (commit)
1943 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1944 6ced4176 2019-07-12 stsp return err;
1947 9d31a1d8 2018-03-11 stsp const struct got_error *
1948 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1949 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1950 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1951 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
1953 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1954 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1955 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1956 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1957 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1958 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1959 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1960 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1961 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1962 f2ea84fa 2019-07-27 stsp int entry_type;
1963 f2ea84fa 2019-07-27 stsp char *relpath;
1964 f2ea84fa 2019-07-27 stsp char *entry_name;
1965 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1966 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1968 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1970 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1972 9d31a1d8 2018-03-11 stsp return err;
1974 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1975 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1976 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1977 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1978 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1979 f2ea84fa 2019-07-27 stsp goto done;
1982 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1983 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1984 f2ea84fa 2019-07-27 stsp if (err) {
1985 f2ea84fa 2019-07-27 stsp free(tpd);
1986 6ced4176 2019-07-12 stsp goto done;
1989 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1990 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1991 f2ea84fa 2019-07-27 stsp if (err) {
1992 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1993 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1994 f2ea84fa 2019-07-27 stsp free(tpd);
1995 f2ea84fa 2019-07-27 stsp goto done;
1998 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2000 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2004 51514078 2018-12-25 stsp * Read the file index.
2005 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2006 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2008 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2010 c4cdcb68 2019-04-03 stsp goto done;
2012 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2013 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2014 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2016 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2017 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2018 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2022 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2023 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2024 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2025 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2026 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2027 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2028 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2029 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2033 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2035 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2036 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2037 af12c6b9 2019-06-04 stsp err = sync_err;
2039 9c6338c4 2019-06-02 stsp free(fileindex_path);
2041 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2042 9d31a1d8 2018-03-11 stsp if (commit)
2043 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2044 5ade8233 2019-07-12 stsp if (fileindex)
2045 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2046 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2047 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2048 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2049 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2050 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2051 f2ea84fa 2019-07-27 stsp free(tpd);
2053 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2054 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2055 9d31a1d8 2018-03-11 stsp err = unlockerr;
2056 f8d1f275 2019-02-04 stsp return err;
2059 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2060 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2061 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2062 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2063 234035bc 2019-06-01 stsp void *progress_arg;
2064 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2065 234035bc 2019-06-01 stsp void *cancel_arg;
2066 f69721c3 2019-10-21 stsp const char *label_orig;
2067 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2070 234035bc 2019-06-01 stsp static const struct got_error *
2071 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2072 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2073 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2074 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2076 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2077 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2078 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2079 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2080 234035bc 2019-06-01 stsp struct stat sb;
2081 234035bc 2019-06-01 stsp unsigned char status;
2082 234035bc 2019-06-01 stsp int local_changes_subsumed;
2084 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2085 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2086 d6c87207 2019-08-02 stsp strlen(path2));
2087 1ee397ad 2019-07-12 stsp if (ie == NULL)
2088 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2089 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2091 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2092 234035bc 2019-06-01 stsp path2) == -1)
2093 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2095 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2098 234035bc 2019-06-01 stsp goto done;
2100 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2101 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2102 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2103 234035bc 2019-06-01 stsp goto done;
2105 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2106 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2107 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2108 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2109 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2110 234035bc 2019-06-01 stsp goto done;
2113 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2114 f69721c3 2019-10-21 stsp ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2115 f69721c3 2019-10-21 stsp a->commit_id2, repo, a->progress_cb, a->progress_arg);
2116 234035bc 2019-06-01 stsp } else if (blob1) {
2117 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2118 d6c87207 2019-08-02 stsp strlen(path1));
2119 1ee397ad 2019-07-12 stsp if (ie == NULL)
2120 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2121 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2123 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2124 2b92fad7 2019-06-02 stsp path1) == -1)
2125 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2127 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2130 2b92fad7 2019-06-02 stsp goto done;
2132 2b92fad7 2019-06-02 stsp switch (status) {
2133 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2134 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2135 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2137 1ee397ad 2019-07-12 stsp goto done;
2138 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2140 2b92fad7 2019-06-02 stsp goto done;
2142 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2144 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2145 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2146 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2147 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2149 1ee397ad 2019-07-12 stsp goto done;
2151 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2153 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2154 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2155 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2156 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2157 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2159 1ee397ad 2019-07-12 stsp goto done;
2161 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2162 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2164 1ee397ad 2019-07-12 stsp goto done;
2169 234035bc 2019-06-01 stsp } else if (blob2) {
2170 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2171 234035bc 2019-06-01 stsp path2) == -1)
2172 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2173 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2174 d6c87207 2019-08-02 stsp strlen(path2));
2176 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2177 7f91a133 2019-12-13 stsp -1, NULL, repo);
2179 234035bc 2019-06-01 stsp goto done;
2180 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2181 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2182 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2183 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2184 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2185 1ee397ad 2019-07-12 stsp status, path2);
2186 234035bc 2019-06-01 stsp goto done;
2188 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2189 f69721c3 2019-10-21 stsp NULL, ondisk_path, path2, sb.st_mode,
2190 f69721c3 2019-10-21 stsp a->label_orig, blob2, a->commit_id2, repo,
2191 f69721c3 2019-10-21 stsp a->progress_cb,
2192 f69721c3 2019-10-21 stsp a->progress_arg);
2193 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2194 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2195 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2196 234035bc 2019-06-01 stsp blob2, 0);
2198 234035bc 2019-06-01 stsp goto done;
2201 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2202 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2203 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2204 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2205 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2206 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2208 234035bc 2019-06-01 stsp goto done;
2209 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2211 234035bc 2019-06-01 stsp goto done;
2212 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2213 3969253a 2020-03-07 stsp NULL, NULL, 1);
2214 3969253a 2020-03-07 stsp if (err) {
2215 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2216 3969253a 2020-03-07 stsp goto done;
2218 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2219 2b92fad7 2019-06-02 stsp if (err) {
2220 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2221 2b92fad7 2019-06-02 stsp goto done;
2226 234035bc 2019-06-01 stsp free(ondisk_path);
2227 234035bc 2019-06-01 stsp return err;
2230 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2231 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2232 234035bc 2019-06-01 stsp struct got_repository *repo;
2235 234035bc 2019-06-01 stsp static const struct got_error *
2236 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2238 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2239 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2240 234035bc 2019-06-01 stsp unsigned char status;
2241 234035bc 2019-06-01 stsp struct stat sb;
2242 234035bc 2019-06-01 stsp char *ondisk_path;
2244 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2245 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2246 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2247 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2249 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2251 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2253 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2254 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2256 234035bc 2019-06-01 stsp return err;
2257 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2258 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2260 234035bc 2019-06-01 stsp return NULL;
2263 818c7501 2019-07-11 stsp static const struct got_error *
2264 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2265 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2266 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2267 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2268 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2270 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2271 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2272 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2273 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2274 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2276 03415a1a 2019-06-02 stsp if (commit_id1) {
2277 f69721c3 2019-10-21 stsp char *id_str;
2279 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2280 03415a1a 2019-06-02 stsp worktree->path_prefix);
2282 03415a1a 2019-06-02 stsp goto done;
2284 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2286 03415a1a 2019-06-02 stsp goto done;
2288 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2290 f69721c3 2019-10-21 stsp goto done;
2292 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2293 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2294 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2295 f69721c3 2019-10-21 stsp free(id_str);
2296 f69721c3 2019-10-21 stsp goto done;
2298 f69721c3 2019-10-21 stsp free(id_str);
2301 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2302 234035bc 2019-06-01 stsp worktree->path_prefix);
2304 234035bc 2019-06-01 stsp goto done;
2306 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2308 234035bc 2019-06-01 stsp goto done;
2310 234035bc 2019-06-01 stsp arg.worktree = worktree;
2311 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2312 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2313 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2314 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2315 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2316 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2317 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2318 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2319 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2320 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2321 af12c6b9 2019-06-04 stsp err = sync_err;
2323 234035bc 2019-06-01 stsp if (tree1)
2324 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2325 234035bc 2019-06-01 stsp if (tree2)
2326 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2327 f69721c3 2019-10-21 stsp free(label_orig);
2328 818c7501 2019-07-11 stsp return err;
2331 818c7501 2019-07-11 stsp const struct got_error *
2332 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2333 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2334 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2335 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2337 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2338 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2339 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2340 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2342 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2344 818c7501 2019-07-11 stsp return err;
2346 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2348 818c7501 2019-07-11 stsp goto done;
2350 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2351 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2352 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2353 818c7501 2019-07-11 stsp &mok_arg);
2355 818c7501 2019-07-11 stsp goto done;
2357 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2358 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2360 818c7501 2019-07-11 stsp if (fileindex)
2361 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2362 818c7501 2019-07-11 stsp free(fileindex_path);
2363 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2364 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2365 234035bc 2019-06-01 stsp err = unlockerr;
2366 234035bc 2019-06-01 stsp return err;
2369 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2370 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2371 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2372 927df6b7 2019-02-10 stsp const char *status_path;
2373 927df6b7 2019-02-10 stsp size_t status_path_len;
2374 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2375 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2376 f8d1f275 2019-02-04 stsp void *status_arg;
2377 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2378 f8d1f275 2019-02-04 stsp void *cancel_arg;
2379 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2380 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2381 f2a9dc41 2019-12-13 tracey int report_unchanged;
2384 f8d1f275 2019-02-04 stsp static const struct got_error *
2385 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2386 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
2387 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2388 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
2390 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2391 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2392 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2393 927df6b7 2019-02-10 stsp struct stat sb;
2394 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2395 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2396 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2398 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2400 98eaaa12 2019-08-03 stsp return err;
2402 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2403 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2404 98eaaa12 2019-08-03 stsp return NULL;
2406 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2407 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2408 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2410 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2411 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2412 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2414 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2415 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2416 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2417 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2418 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2421 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2422 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2425 927df6b7 2019-02-10 stsp static const struct got_error *
2426 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2427 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
2429 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2430 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2431 f8d1f275 2019-02-04 stsp char *abspath;
2433 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2434 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2436 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2437 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2438 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2439 927df6b7 2019-02-10 stsp return NULL;
2441 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2442 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2443 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2444 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2446 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2447 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2448 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2451 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
2452 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2453 f8d1f275 2019-02-04 stsp free(abspath);
2454 9d31a1d8 2018-03-11 stsp return err;
2457 f8d1f275 2019-02-04 stsp static const struct got_error *
2458 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2460 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2461 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2462 2ec1f75b 2019-03-26 stsp unsigned char status;
2464 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2465 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2467 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2468 927df6b7 2019-02-10 stsp return NULL;
2470 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2471 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2472 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2473 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2475 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2476 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2477 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2481 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2483 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2485 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2486 6841da00 2019-08-08 stsp free((char *)pe->path);
2487 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2491 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2493 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2495 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2496 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2497 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2498 6841da00 2019-08-08 stsp free((char *)pe->path);
2500 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2503 6841da00 2019-08-08 stsp static const struct got_error *
2504 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2506 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2507 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2508 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2509 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2510 6841da00 2019-08-08 stsp size_t linesize = 0;
2511 6841da00 2019-08-08 stsp ssize_t linelen;
2513 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2514 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2515 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2516 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2518 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2519 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2520 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2522 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
2523 bd8de430 2019-10-04 stsp if (line[0] == '#')
2526 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
2527 bd8de430 2019-10-04 stsp if (line[0] == '!')
2530 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2531 6841da00 2019-08-08 stsp line) == -1) {
2532 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2533 6841da00 2019-08-08 stsp goto done;
2535 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2537 6841da00 2019-08-08 stsp goto done;
2539 6841da00 2019-08-08 stsp if (ferror(f)) {
2540 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2541 6841da00 2019-08-08 stsp goto done;
2544 6841da00 2019-08-08 stsp dirpath = strdup(path);
2545 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2546 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2547 6841da00 2019-08-08 stsp goto done;
2549 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2551 6841da00 2019-08-08 stsp free(line);
2552 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2553 6841da00 2019-08-08 stsp free(dirpath);
2554 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2556 6841da00 2019-08-08 stsp return err;
2560 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2562 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2564 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
2565 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
2566 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
2567 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
2569 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2570 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
2572 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
2574 bd8de430 2019-10-04 stsp pattern += 3;
2576 bd8de430 2019-10-04 stsp while (*p) {
2577 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
2578 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
2579 bd8de430 2019-10-04 stsp /* Retry in next directory. */
2580 bd8de430 2019-10-04 stsp while (*p && *p != '/')
2582 bd8de430 2019-10-04 stsp while (*p == '/')
2592 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2593 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2594 6841da00 2019-08-08 stsp * ignores backwards.
2596 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2597 6841da00 2019-08-08 stsp while (pe) {
2598 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2599 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2600 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2601 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2602 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
2603 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
2604 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
2605 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
2606 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
2611 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2617 6841da00 2019-08-08 stsp static const struct got_error *
2618 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2619 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
2621 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2622 6841da00 2019-08-08 stsp char *ignorespath;
2623 886cec17 2019-12-15 stsp int fd = -1;
2624 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2626 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2627 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
2628 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2630 886cec17 2019-12-15 stsp if (dirfd != -1) {
2631 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
2632 886cec17 2019-12-15 stsp if (fd == -1) {
2633 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2634 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
2635 886cec17 2019-12-15 stsp ignorespath);
2637 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
2638 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
2639 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
2640 886cec17 2019-12-15 stsp ignorespath);
2643 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
2647 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
2648 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
2649 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2650 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
2651 886cec17 2019-12-15 stsp ignorespath);
2653 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
2656 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2657 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
2658 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2659 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
2660 6841da00 2019-08-08 stsp free(ignorespath);
2661 6841da00 2019-08-08 stsp return err;
2664 f8d1f275 2019-02-04 stsp static const struct got_error *
2665 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
2667 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2668 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2669 f8d1f275 2019-02-04 stsp char *path = NULL;
2671 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2672 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2674 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2675 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2676 927df6b7 2019-02-10 stsp return NULL;
2678 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2679 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2680 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2682 f8d1f275 2019-02-04 stsp path = de->d_name;
2685 bd8de430 2019-10-04 stsp if (de->d_type == DT_DIR) {
2686 32d2fb48 2019-12-15 stsp int subdirfd = openat(dirfd, de->d_name,
2687 886cec17 2019-12-15 stsp O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2688 32d2fb48 2019-12-15 stsp if (subdirfd == -1) {
2689 32d2fb48 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2690 32d2fb48 2019-12-15 stsp err = got_error_from_errno2("openat", path);
2692 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
2693 886cec17 2019-12-15 stsp path, subdirfd, ".cvsignore");
2694 886cec17 2019-12-15 stsp if (err == NULL)
2695 886cec17 2019-12-15 stsp err = add_ignores(&a->ignores,
2696 886cec17 2019-12-15 stsp a->worktree->root_path, path,
2697 886cec17 2019-12-15 stsp subdirfd, ".gitignore");
2698 886cec17 2019-12-15 stsp if (close(subdirfd) == -1 && err == NULL)
2699 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
2701 886cec17 2019-12-15 stsp } else if (got_path_is_child(path, a->status_path, a->status_path_len)
2702 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2703 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2704 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2705 f8d1f275 2019-02-04 stsp if (parent_path[0])
2706 f8d1f275 2019-02-04 stsp free(path);
2707 b72f483a 2019-02-05 stsp return err;
2710 347d1d3e 2019-07-12 stsp static const struct got_error *
2711 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2712 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2713 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
2715 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2716 abb4604f 2019-07-27 stsp struct stat sb;
2718 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2720 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
2721 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
2723 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2724 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2725 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2726 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2727 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2728 abb4604f 2019-07-27 stsp return NULL;
2731 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2732 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2733 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2735 abb4604f 2019-07-27 stsp return NULL;
2738 abb4604f 2019-07-27 stsp static const struct got_error *
2739 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2740 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2741 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2742 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2743 f2a9dc41 2019-12-13 tracey int report_unchanged)
2745 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2746 6fc93f37 2019-12-13 stsp int fd = -1;
2747 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2748 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2749 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2751 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2752 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2753 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2755 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2756 6fc93f37 2019-12-13 stsp if (fd == -1) {
2757 40b289d7 2019-09-07 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2758 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
2760 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2761 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
2762 f2a9dc41 2019-12-13 tracey report_unchanged);
2764 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2765 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2766 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2767 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2768 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2769 abb4604f 2019-07-27 stsp arg.status_path = path;
2770 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2771 abb4604f 2019-07-27 stsp arg.repo = repo;
2772 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2773 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2774 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2775 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2776 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
2777 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2778 022fae89 2019-12-06 tracey if (!no_ignores) {
2779 bd8de430 2019-10-04 stsp err = add_ignores(&arg.ignores, worktree->root_path,
2780 886cec17 2019-12-15 stsp path, fd, ".cvsignore");
2781 022fae89 2019-12-06 tracey if (err == NULL)
2782 022fae89 2019-12-06 tracey err = add_ignores(&arg.ignores,
2783 886cec17 2019-12-15 stsp worktree->root_path, path, fd,
2784 886cec17 2019-12-15 stsp ".gitignore");
2786 bd8de430 2019-10-04 stsp if (err == NULL)
2787 6fc93f37 2019-12-13 stsp err = got_fileindex_diff_dir(fileindex, fd,
2788 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2789 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2792 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
2793 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
2794 927df6b7 2019-02-10 stsp free(ondisk_path);
2795 347d1d3e 2019-07-12 stsp return err;
2798 347d1d3e 2019-07-12 stsp const struct got_error *
2799 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2800 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2801 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2802 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2804 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2805 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2806 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2807 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2809 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2811 347d1d3e 2019-07-12 stsp return err;
2813 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2814 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2815 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
2819 f8d1f275 2019-02-04 stsp free(fileindex_path);
2820 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2821 f8d1f275 2019-02-04 stsp return err;
2824 6c7ab921 2019-03-18 stsp const struct got_error *
2825 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2826 6c7ab921 2019-03-18 stsp const char *arg)
2828 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2829 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2830 6c7ab921 2019-03-18 stsp size_t len;
2832 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2834 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2835 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2836 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2837 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2838 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2839 d0710d08 2019-07-22 stsp if (cwd == NULL)
2840 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2841 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2842 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2843 d0710d08 2019-07-22 stsp goto done;
2847 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2848 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2849 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
2850 6c7ab921 2019-03-18 stsp goto done;
2853 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2854 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2855 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2857 f6d88e1a 2019-05-29 stsp goto done;
2859 f6d88e1a 2019-05-29 stsp path = strdup("");
2860 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2861 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2862 f6d88e1a 2019-05-29 stsp goto done;
2866 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2867 6c7ab921 2019-03-18 stsp len = strlen(path);
2868 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2869 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2873 6c7ab921 2019-03-18 stsp free(resolved);
2874 d0710d08 2019-07-22 stsp free(cwd);
2875 6c7ab921 2019-03-18 stsp if (err == NULL)
2876 6c7ab921 2019-03-18 stsp *wt_path = path;
2878 6c7ab921 2019-03-18 stsp free(path);
2879 d00136be 2019-03-26 stsp return err;
2882 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
2883 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
2884 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
2885 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
2886 4e68cba3 2019-11-23 stsp void *progress_arg;
2887 4e68cba3 2019-11-23 stsp struct got_repository *repo;
2890 4e68cba3 2019-11-23 stsp static const struct got_error *
2891 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
2892 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
2893 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2894 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2896 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
2897 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2898 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2899 6d022e97 2019-08-04 stsp struct stat sb;
2900 dbb83fbd 2019-12-12 stsp char *ondisk_path;
2902 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2903 dbb83fbd 2019-12-12 stsp relpath) == -1)
2904 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
2906 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2908 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
2909 12463d8b 2019-12-13 stsp de_name, a->repo);
2911 dbb83fbd 2019-12-12 stsp goto done;
2912 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2913 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2914 dbb83fbd 2019-12-12 stsp goto done;
2915 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2917 dbb83fbd 2019-12-12 stsp goto done;
2920 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
2921 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
2922 dbb83fbd 2019-12-12 stsp goto done;
2925 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
2927 4e68cba3 2019-11-23 stsp goto done;
2928 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
2929 3969253a 2020-03-07 stsp if (err) {
2930 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2931 3969253a 2020-03-07 stsp goto done;
2933 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2934 07f5b47a 2019-06-02 stsp if (err) {
2935 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2936 4e68cba3 2019-11-23 stsp goto done;
2939 dbb83fbd 2019-12-12 stsp free(ondisk_path);
2941 dbb83fbd 2019-12-12 stsp return err;
2942 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
2943 dbb83fbd 2019-12-12 stsp return NULL;
2944 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
2947 d00136be 2019-03-26 stsp const struct got_error *
2948 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2949 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2950 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2951 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
2953 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2954 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2955 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2956 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2957 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
2959 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2961 d00136be 2019-03-26 stsp return err;
2963 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2965 d00136be 2019-03-26 stsp goto done;
2967 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
2968 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
2969 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
2970 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
2971 4e68cba3 2019-11-23 stsp saa.repo = repo;
2973 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2974 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2975 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
2979 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2980 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2981 af12c6b9 2019-06-04 stsp err = sync_err;
2983 fb399478 2019-07-12 stsp free(fileindex_path);
2984 d00136be 2019-03-26 stsp if (fileindex)
2985 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2986 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2987 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2988 d00136be 2019-03-26 stsp err = unlockerr;
2989 6c7ab921 2019-03-18 stsp return err;
2992 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
2993 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
2994 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
2995 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
2996 f2a9dc41 2019-12-13 tracey void *progress_arg;
2997 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
2998 f2a9dc41 2019-12-13 tracey int delete_local_mods;
2999 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3002 f2a9dc41 2019-12-13 tracey static const struct got_error *
3003 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3004 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3005 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3006 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3008 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3009 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3010 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3011 17ed4618 2019-06-02 stsp struct stat sb;
3012 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
3014 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3015 17ed4618 2019-06-02 stsp if (ie == NULL)
3016 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3018 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3019 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3020 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3021 9acbc4fa 2019-08-03 stsp return NULL;
3022 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3025 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3026 f2a9dc41 2019-12-13 tracey relpath) == -1)
3027 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3029 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3032 f2a9dc41 2019-12-13 tracey goto done;
3034 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3035 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3036 f2a9dc41 2019-12-13 tracey goto done;
3037 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3038 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3039 f2a9dc41 2019-12-13 tracey goto done;
3041 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3042 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3043 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3044 f2a9dc41 2019-12-13 tracey goto done;
3048 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3049 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3050 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3051 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3052 12463d8b 2019-12-13 stsp ondisk_path);
3053 12463d8b 2019-12-13 stsp goto done;
3055 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3056 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3057 12463d8b 2019-12-13 stsp goto done;
3060 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3062 15341bfd 2020-03-05 tracey if (parent == NULL) {
3063 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3064 15341bfd 2020-03-05 tracey goto done;
3066 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3067 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3068 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3069 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3070 15341bfd 2020-03-05 tracey parent);
3073 15341bfd 2020-03-05 tracey parent = dirname(parent);
3074 15341bfd 2020-03-05 tracey if (parent == NULL) {
3075 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3076 15341bfd 2020-03-05 tracey goto done;
3081 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3083 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3084 f2a9dc41 2019-12-13 tracey if (err)
3085 f2a9dc41 2019-12-13 tracey return err;
3086 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3087 f2a9dc41 2019-12-13 tracey return NULL;
3088 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3089 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3092 2ec1f75b 2019-03-26 stsp const struct got_error *
3093 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3094 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3095 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3096 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3098 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3099 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3100 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3101 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3102 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3104 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3106 2ec1f75b 2019-03-26 stsp return err;
3108 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3110 2ec1f75b 2019-03-26 stsp goto done;
3112 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3113 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3114 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3115 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3116 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3117 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3118 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3120 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3121 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3122 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3126 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3127 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3128 af12c6b9 2019-06-04 stsp err = sync_err;
3130 fb399478 2019-07-12 stsp free(fileindex_path);
3131 2ec1f75b 2019-03-26 stsp if (fileindex)
3132 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3133 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3134 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3135 2ec1f75b 2019-03-26 stsp err = unlockerr;
3136 33aa809d 2019-08-08 stsp return err;
3139 33aa809d 2019-08-08 stsp static const struct got_error *
3140 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3142 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3143 33aa809d 2019-08-08 stsp char *line = NULL;
3144 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3145 33aa809d 2019-08-08 stsp ssize_t linelen;
3147 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3148 33aa809d 2019-08-08 stsp if (linelen == -1) {
3149 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3150 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3151 33aa809d 2019-08-08 stsp goto done;
3153 33aa809d 2019-08-08 stsp return NULL;
3155 33aa809d 2019-08-08 stsp if (outfile) {
3156 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3157 33aa809d 2019-08-08 stsp if (n != linelen) {
3158 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3159 33aa809d 2019-08-08 stsp goto done;
3162 33aa809d 2019-08-08 stsp if (rejectfile) {
3163 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3164 33aa809d 2019-08-08 stsp if (n != linelen)
3165 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3168 33aa809d 2019-08-08 stsp free(line);
3169 2ec1f75b 2019-03-26 stsp return err;
3172 33aa809d 2019-08-08 stsp static const struct got_error *
3173 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3175 33aa809d 2019-08-08 stsp char *line = NULL;
3176 33aa809d 2019-08-08 stsp size_t linesize = 0;
3177 33aa809d 2019-08-08 stsp ssize_t linelen;
3179 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3180 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3181 500467ff 2019-09-25 hiltjo if (ferror(f))
3182 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3183 500467ff 2019-09-25 hiltjo return NULL;
3185 33aa809d 2019-08-08 stsp free(line);
3186 33aa809d 2019-08-08 stsp return NULL;
3189 33aa809d 2019-08-08 stsp static const struct got_error *
3190 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3191 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3192 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3194 33aa809d 2019-08-08 stsp const struct got_error *err;
3196 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3197 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3198 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3200 33aa809d 2019-08-08 stsp return err;
3201 33aa809d 2019-08-08 stsp (*line_cur1)++;
3203 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3204 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3205 33aa809d 2019-08-08 stsp if (rejectfile)
3206 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3208 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3210 33aa809d 2019-08-08 stsp return err;
3211 33aa809d 2019-08-08 stsp (*line_cur2)++;
3213 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3214 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3215 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3217 33aa809d 2019-08-08 stsp return err;
3218 33aa809d 2019-08-08 stsp (*line_cur2)++;
3220 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3221 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3222 33aa809d 2019-08-08 stsp if (rejectfile)
3223 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3225 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3227 33aa809d 2019-08-08 stsp return err;
3228 33aa809d 2019-08-08 stsp (*line_cur1)++;
3231 f1e81a05 2019-08-10 stsp return NULL;
3234 f1e81a05 2019-08-10 stsp static const struct got_error *
3235 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3236 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3238 f1e81a05 2019-08-10 stsp const struct got_error *err;
3240 f1e81a05 2019-08-10 stsp if (outfile) {
3241 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3242 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3243 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3245 f1e81a05 2019-08-10 stsp return err;
3246 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3249 f1e81a05 2019-08-10 stsp if (rejectfile) {
3250 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3251 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3252 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3254 f1e81a05 2019-08-10 stsp return err;
3255 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3259 33aa809d 2019-08-08 stsp return NULL;
3262 33aa809d 2019-08-08 stsp static const struct got_error *
3263 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3264 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3265 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3266 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3267 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3269 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3270 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3271 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3272 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3273 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
3274 33aa809d 2019-08-08 stsp long pos1, pos2;
3275 33aa809d 2019-08-08 stsp FILE *hunkfile;
3277 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3279 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
3280 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
3281 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
3283 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
3284 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
3286 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
3287 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3289 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
3290 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3291 33aa809d 2019-08-08 stsp goto done;
3293 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
3294 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3295 33aa809d 2019-08-08 stsp goto done;
3297 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3298 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
3299 33aa809d 2019-08-08 stsp goto done;
3302 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3303 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
3305 33aa809d 2019-08-08 stsp goto done;
3307 33aa809d 2019-08-08 stsp switch (*choice) {
3308 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
3309 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3310 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
3312 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3313 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3314 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3316 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3319 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3323 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3324 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3325 33aa809d 2019-08-08 stsp return err;
3328 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3329 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3330 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3331 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3332 1f1abb7e 2019-08-08 stsp void *progress_arg;
3333 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3334 33aa809d 2019-08-08 stsp void *patch_arg;
3335 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3338 e20a8b6f 2019-06-04 stsp static const struct got_error *
3339 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3340 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3341 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
3342 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3343 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3345 33aa809d 2019-08-08 stsp const struct got_error *err;
3346 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3347 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3348 1ebedb77 2019-10-19 stsp int fd2 = -1;
3349 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3350 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3351 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3352 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3353 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3354 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3355 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3356 33aa809d 2019-08-08 stsp int n = 0;
3358 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3360 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3362 33aa809d 2019-08-08 stsp return err;
3364 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
3365 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3366 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3367 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", path2);
3368 12463d8b 2019-12-13 stsp goto done;
3371 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3372 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3373 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", path2);
3374 12463d8b 2019-12-13 stsp goto done;
3377 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
3378 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
3379 1ebedb77 2019-10-19 stsp goto done;
3382 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
3383 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3384 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", path2);
3385 33aa809d 2019-08-08 stsp goto done;
3389 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3391 33aa809d 2019-08-08 stsp goto done;
3393 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3395 33aa809d 2019-08-08 stsp goto done;
3397 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3399 33aa809d 2019-08-08 stsp goto done;
3401 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3402 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3403 33aa809d 2019-08-08 stsp goto done;
3406 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3407 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3409 33aa809d 2019-08-08 stsp goto done;
3411 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3413 33aa809d 2019-08-08 stsp goto done;
3415 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3416 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3417 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3418 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3419 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3420 33aa809d 2019-08-08 stsp int choice;
3421 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3422 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3423 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3424 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3425 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3426 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3428 33aa809d 2019-08-08 stsp goto done;
3429 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3430 33aa809d 2019-08-08 stsp have_content = 1;
3431 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3434 1ebedb77 2019-10-19 stsp if (have_content) {
3435 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3436 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3437 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3439 1ebedb77 2019-10-19 stsp goto done;
3441 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
3442 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
3443 1ebedb77 2019-10-19 stsp goto done;
3447 33aa809d 2019-08-08 stsp free(id_str);
3449 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3450 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3451 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3452 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3453 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3454 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3455 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
3456 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3457 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3458 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3459 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3460 33aa809d 2019-08-08 stsp if (err || !have_content) {
3461 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3462 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3463 33aa809d 2019-08-08 stsp free(*path_outfile);
3464 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3466 33aa809d 2019-08-08 stsp free(args);
3468 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3471 33aa809d 2019-08-08 stsp if (changes)
3472 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3473 33aa809d 2019-08-08 stsp free(path1);
3474 33aa809d 2019-08-08 stsp return err;
3477 33aa809d 2019-08-08 stsp static const struct got_error *
3478 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3479 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3480 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3481 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3483 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3484 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3485 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3486 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3487 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3488 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3489 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3490 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3491 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3492 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3494 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3495 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3496 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3497 d3bcc3d1 2019-08-08 stsp return NULL;
3499 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3500 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3501 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3503 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3504 65084dad 2019-08-08 stsp if (ie == NULL)
3505 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3507 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3508 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3509 a129376b 2019-03-28 stsp if (err) {
3510 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3511 a129376b 2019-03-28 stsp goto done;
3512 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3513 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3514 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3515 e20a8b6f 2019-06-04 stsp goto done;
3518 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3519 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3520 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3521 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3522 a129376b 2019-03-28 stsp goto done;
3525 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3526 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3527 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3528 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3529 a129376b 2019-03-28 stsp goto done;
3532 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3533 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3534 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3535 a129376b 2019-03-28 stsp goto done;
3540 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3541 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3542 a9fa2909 2019-07-27 stsp if (err) {
3543 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3544 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3545 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3546 a9fa2909 2019-07-27 stsp goto done;
3548 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3550 a9fa2909 2019-07-27 stsp goto done;
3552 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3553 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3554 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3555 a9fa2909 2019-07-27 stsp goto done;
3558 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3559 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3560 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3561 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3562 a9fa2909 2019-07-27 stsp goto done;
3566 a129376b 2019-03-28 stsp switch (status) {
3567 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3568 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3569 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3570 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3571 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3573 33aa809d 2019-08-08 stsp goto done;
3574 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3577 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3578 1f1abb7e 2019-08-08 stsp ie->path);
3580 1ee397ad 2019-07-12 stsp goto done;
3581 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3583 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3584 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3585 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3586 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3587 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3589 33aa809d 2019-08-08 stsp goto done;
3590 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3593 33aa809d 2019-08-08 stsp /* fall through */
3594 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3595 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
3596 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3597 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3598 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3599 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3600 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3601 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3602 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3604 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3605 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3606 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3608 65084dad 2019-08-08 stsp goto done;
3610 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3611 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3612 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3613 a129376b 2019-03-28 stsp goto done;
3616 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3617 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3618 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3619 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
3620 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3621 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3623 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3624 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3625 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3626 33aa809d 2019-08-08 stsp goto done;
3629 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3630 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3631 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3632 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3634 a129376b 2019-03-28 stsp goto done;
3635 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
3636 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
3637 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3638 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3641 33aa809d 2019-08-08 stsp goto done;
3650 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3651 33aa809d 2019-08-08 stsp free(path_content);
3652 e20a8b6f 2019-06-04 stsp free(parent_path);
3653 a129376b 2019-03-28 stsp free(tree_path);
3655 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3657 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3658 a129376b 2019-03-28 stsp free(tree_id);
3659 e20a8b6f 2019-06-04 stsp return err;
3662 e20a8b6f 2019-06-04 stsp const struct got_error *
3663 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3664 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3665 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3666 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3667 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3669 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3670 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3671 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3672 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3673 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3674 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3676 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3678 e20a8b6f 2019-06-04 stsp return err;
3680 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3682 e20a8b6f 2019-06-04 stsp goto done;
3684 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3685 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3686 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3687 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3688 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3689 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3690 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3691 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3692 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3693 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
3697 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3698 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3699 e20a8b6f 2019-06-04 stsp err = sync_err;
3701 fb399478 2019-07-12 stsp free(fileindex_path);
3702 a129376b 2019-03-28 stsp if (fileindex)
3703 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3704 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3705 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3706 a129376b 2019-03-28 stsp err = unlockerr;
3707 c4296144 2019-05-09 stsp return err;
3710 cf066bf8 2019-05-09 stsp static void
3711 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3713 24519714 2019-05-09 stsp free(ct->path);
3714 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3715 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3716 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3717 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3718 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3719 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3723 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3724 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3725 24519714 2019-05-09 stsp struct got_repository *repo;
3726 24519714 2019-05-09 stsp struct got_worktree *worktree;
3727 5f8a88c6 2019-08-03 stsp int have_staged_files;
3730 c4296144 2019-05-09 stsp static const struct got_error *
3731 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3732 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3733 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3734 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3736 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3737 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3738 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3739 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3740 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3741 768aea60 2019-05-09 stsp struct stat sb;
3743 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3744 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3745 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3746 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3747 5f8a88c6 2019-08-03 stsp return NULL;
3749 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3750 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3752 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3753 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
3754 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3755 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3756 5f8a88c6 2019-08-03 stsp return NULL;
3759 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3760 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3761 036813ee 2019-05-09 stsp goto done;
3763 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3764 036813ee 2019-05-09 stsp parent_path = strdup("");
3765 69960a46 2019-05-09 stsp if (parent_path == NULL)
3766 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3768 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3770 69960a46 2019-05-09 stsp return err;
3773 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3774 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3775 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3776 c4296144 2019-05-09 stsp goto done;
3779 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3780 768aea60 2019-05-09 stsp relpath) == -1) {
3781 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3782 768aea60 2019-05-09 stsp goto done;
3784 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3785 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3787 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3788 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
3789 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
3790 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
3791 12463d8b 2019-12-13 stsp ct->ondisk_path);
3792 12463d8b 2019-12-13 stsp goto done;
3794 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
3795 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3796 768aea60 2019-05-09 stsp goto done;
3798 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3801 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3802 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3803 44d03001 2019-05-09 stsp relpath) == -1) {
3804 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3805 44d03001 2019-05-09 stsp goto done;
3808 cf066bf8 2019-05-09 stsp ct->status = status;
3809 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3810 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3811 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3812 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3813 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3814 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3815 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3816 b416585c 2019-05-13 stsp goto done;
3818 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3819 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3820 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3821 f0b75401 2019-08-03 stsp goto done;
3824 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3825 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3826 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3827 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3828 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3829 036813ee 2019-05-09 stsp goto done;
3832 24519714 2019-05-09 stsp ct->path = strdup(path);
3833 24519714 2019-05-09 stsp if (ct->path == NULL) {
3834 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3835 24519714 2019-05-09 stsp goto done;
3837 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3839 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3840 ed175427 2019-05-09 stsp free_commitable(ct);
3841 24519714 2019-05-09 stsp free(parent_path);
3842 036813ee 2019-05-09 stsp free(path);
3843 a129376b 2019-03-28 stsp return err;
3846 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
3847 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3848 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3849 036813ee 2019-05-09 stsp struct got_repository *);
3851 ed175427 2019-05-09 stsp static const struct got_error *
3852 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
3853 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3854 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3855 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3856 afa376bf 2019-05-09 stsp struct got_repository *repo)
3858 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3859 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3860 036813ee 2019-05-09 stsp char *subpath;
3862 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3863 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3864 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3866 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
3868 ed175427 2019-05-09 stsp return err;
3870 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
3871 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
3872 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3873 036813ee 2019-05-09 stsp free(subpath);
3874 036813ee 2019-05-09 stsp return err;
3877 036813ee 2019-05-09 stsp static const struct got_error *
3878 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3880 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3881 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3883 036813ee 2019-05-09 stsp *match = 0;
3885 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3886 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3887 0f63689d 2019-05-10 stsp return NULL;
3890 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3892 0f63689d 2019-05-10 stsp return err;
3893 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3894 036813ee 2019-05-09 stsp free(ct_parent_path);
3895 036813ee 2019-05-09 stsp return err;
3898 768aea60 2019-05-09 stsp static mode_t
3899 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3901 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3904 036813ee 2019-05-09 stsp static const struct got_error *
3905 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3906 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3908 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3910 036813ee 2019-05-09 stsp *new_te = NULL;
3912 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3914 036813ee 2019-05-09 stsp goto done;
3916 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3918 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3919 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3920 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3922 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3924 036813ee 2019-05-09 stsp if (err && *new_te) {
3925 56e0773d 2019-11-28 stsp free(*new_te);
3926 036813ee 2019-05-09 stsp *new_te = NULL;
3928 036813ee 2019-05-09 stsp return err;
3931 036813ee 2019-05-09 stsp static const struct got_error *
3932 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3933 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3935 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3936 036813ee 2019-05-09 stsp char *ct_name;
3938 036813ee 2019-05-09 stsp *new_te = NULL;
3940 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3941 036813ee 2019-05-09 stsp if (*new_te == NULL)
3942 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3944 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3945 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3946 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3947 036813ee 2019-05-09 stsp goto done;
3949 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
3950 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
3951 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
3952 036813ee 2019-05-09 stsp goto done;
3955 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3957 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3958 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3959 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3961 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3963 036813ee 2019-05-09 stsp if (err && *new_te) {
3964 56e0773d 2019-11-28 stsp free(*new_te);
3965 036813ee 2019-05-09 stsp *new_te = NULL;
3967 036813ee 2019-05-09 stsp return err;
3970 036813ee 2019-05-09 stsp static const struct got_error *
3971 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3972 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3974 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3975 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3977 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3979 036813ee 2019-05-09 stsp return err;
3980 036813ee 2019-05-09 stsp if (new_pe == NULL)
3981 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3982 036813ee 2019-05-09 stsp return NULL;
3985 afa376bf 2019-05-09 stsp static const struct got_error *
3986 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3987 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3989 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3990 5f8a88c6 2019-08-03 stsp unsigned char status;
3992 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3993 afa376bf 2019-05-09 stsp ct_path++;
3995 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3996 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3998 5f8a88c6 2019-08-03 stsp status = ct->status;
4000 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4001 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4004 036813ee 2019-05-09 stsp static const struct got_error *
4005 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4006 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4008 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4009 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4010 44d03001 2019-05-09 stsp char *te_path;
4012 44d03001 2019-05-09 stsp *modified = 0;
4014 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4015 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4016 44d03001 2019-05-09 stsp te->name) == -1)
4017 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4019 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4020 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4021 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4022 44d03001 2019-05-09 stsp strlen(te_path));
4023 44d03001 2019-05-09 stsp if (*modified)
4027 44d03001 2019-05-09 stsp free(te_path);
4028 44d03001 2019-05-09 stsp return err;
4031 44d03001 2019-05-09 stsp static const struct got_error *
4032 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4033 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4034 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4036 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4037 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4039 036813ee 2019-05-09 stsp *ctp = NULL;
4041 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4042 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4043 036813ee 2019-05-09 stsp char *ct_name = NULL;
4044 036813ee 2019-05-09 stsp int path_matches;
4046 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4047 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
4048 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
4049 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
4052 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
4053 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
4057 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4060 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4062 036813ee 2019-05-09 stsp return err;
4063 036813ee 2019-05-09 stsp if (!path_matches)
4066 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
4067 036813ee 2019-05-09 stsp if (ct_name == NULL)
4068 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
4070 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
4073 036813ee 2019-05-09 stsp *ctp = ct;
4077 2b496619 2019-07-10 stsp return err;
4080 2b496619 2019-07-10 stsp static const struct got_error *
4081 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4082 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
4083 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
4084 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
4085 2b496619 2019-07-10 stsp struct got_repository *repo)
4087 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
4088 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
4089 2b496619 2019-07-10 stsp char *subtree_path;
4090 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
4091 ba580f68 2020-03-22 stsp int nentries;
4093 2b496619 2019-07-10 stsp *new_tep = NULL;
4095 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4096 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
4097 2b496619 2019-07-10 stsp child_path) == -1)
4098 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
4100 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
4101 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
4102 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
4103 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
4105 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4106 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
4107 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4108 2b496619 2019-07-10 stsp goto done;
4110 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
4111 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
4112 2b496619 2019-07-10 stsp if (err) {
4113 56e0773d 2019-11-28 stsp free(new_te);
4114 2b496619 2019-07-10 stsp goto done;
4116 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
4119 2b496619 2019-07-10 stsp free(subtree_path);
4120 2b496619 2019-07-10 stsp if (err == NULL)
4121 2b496619 2019-07-10 stsp *new_tep = new_te;
4122 036813ee 2019-05-09 stsp return err;
4125 036813ee 2019-05-09 stsp static const struct got_error *
4126 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
4127 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
4128 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4129 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4130 036813ee 2019-05-09 stsp struct got_repository *repo)
4132 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4133 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
4134 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
4135 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4137 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
4138 ba580f68 2020-03-22 stsp *nentries = 0;
4140 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
4141 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4142 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4143 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
4145 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
4146 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
4147 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
4150 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
4151 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
4154 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4155 036813ee 2019-05-09 stsp pe->path);
4157 036813ee 2019-05-09 stsp goto done;
4159 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
4160 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
4161 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
4163 036813ee 2019-05-09 stsp goto done;
4164 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
4166 afa376bf 2019-05-09 stsp goto done;
4167 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
4168 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4170 2f51b5b3 2019-05-09 stsp goto done;
4171 ba580f68 2020-03-22 stsp (*nentries)++;
4173 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
4174 2b496619 2019-07-10 stsp if (base_tree == NULL ||
4175 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
4176 2b496619 2019-07-10 stsp == NULL) {
4177 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
4178 2b496619 2019-07-10 stsp child_path, path_base_tree,
4179 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
4182 2b496619 2019-07-10 stsp goto done;
4183 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4185 2b496619 2019-07-10 stsp goto done;
4186 ba580f68 2020-03-22 stsp (*nentries)++;
4191 2f51b5b3 2019-05-09 stsp if (base_tree) {
4192 56e0773d 2019-11-28 stsp int i, nbase_entries;
4193 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
4194 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
4195 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
4196 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4198 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
4199 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
4200 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
4201 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
4203 63c5ca5d 2019-08-24 stsp goto done;
4204 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
4206 63c5ca5d 2019-08-24 stsp goto done;
4207 ba580f68 2020-03-22 stsp (*nentries)++;
4211 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
4212 44d03001 2019-05-09 stsp int modified;
4213 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4215 036813ee 2019-05-09 stsp goto done;
4216 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
4217 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4219 2f51b5b3 2019-05-09 stsp goto done;
4220 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4221 44d03001 2019-05-09 stsp if (modified) {
4222 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
4223 ba580f68 2020-03-22 stsp int nsubentries;
4224 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
4225 ba580f68 2020-03-22 stsp &nsubentries, te,
4226 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4227 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4229 44d03001 2019-05-09 stsp goto done;
4230 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
4231 ba580f68 2020-03-22 stsp /* All entries were deleted. */
4232 ba580f68 2020-03-22 stsp free(new_id);
4235 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
4236 56e0773d 2019-11-28 stsp sizeof(new_te->id));
4237 56e0773d 2019-11-28 stsp free(new_id);
4239 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4241 036813ee 2019-05-09 stsp goto done;
4242 ba580f68 2020-03-22 stsp (*nentries)++;
4246 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4247 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4249 f66c734c 2019-09-22 stsp goto done;
4251 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4252 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4253 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4254 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4255 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4256 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
4258 2f51b5b3 2019-05-09 stsp goto done;
4259 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4261 2f51b5b3 2019-05-09 stsp goto done;
4262 ba580f68 2020-03-22 stsp (*nentries)++;
4264 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
4265 b416585c 2019-05-13 stsp status_arg);
4267 afa376bf 2019-05-09 stsp goto done;
4269 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
4270 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4272 2f51b5b3 2019-05-09 stsp goto done;
4273 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4275 2f51b5b3 2019-05-09 stsp goto done;
4276 ba580f68 2020-03-22 stsp (*nentries)++;
4281 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
4282 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
4284 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
4285 ed175427 2019-05-09 stsp return err;
4288 ebf99748 2019-05-09 stsp static const struct got_error *
4289 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4290 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4291 72fd46fa 2019-09-06 stsp int have_staged_files)
4293 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
4294 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
4296 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4297 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
4298 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4300 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4302 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
4303 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
4304 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
4305 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
4306 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4307 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
4308 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
4309 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
4310 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
4311 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4312 72fd46fa 2019-09-06 stsp !have_staged_files);
4314 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
4315 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
4316 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4317 72fd46fa 2019-09-06 stsp !have_staged_files);
4319 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
4322 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
4323 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
4324 3969253a 2020-03-07 stsp if (err) {
4325 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4328 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
4329 3969253a 2020-03-07 stsp if (err) {
4330 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4335 d56d26ce 2019-05-10 stsp return err;
4339 d56d26ce 2019-05-10 stsp static const struct got_error *
4340 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
4341 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
4342 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
4343 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
4344 735ef5ac 2019-08-03 stsp int ood_errcode)
4346 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
4347 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
4349 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4350 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
4351 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4352 1a36436d 2019-06-10 stsp return NULL;
4354 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
4355 9bead371 2019-07-28 stsp * on matches file content in the branch head.
4357 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4358 735ef5ac 2019-08-03 stsp in_repo_path);
4359 9bead371 2019-07-28 stsp if (err) {
4360 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
4361 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
4362 1a36436d 2019-06-10 stsp goto done;
4363 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4364 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4366 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4367 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4368 735ef5ac 2019-08-03 stsp in_repo_path);
4369 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4370 1a36436d 2019-06-10 stsp goto done;
4371 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4375 1a36436d 2019-06-10 stsp return err;
4378 c4296144 2019-05-09 stsp const struct got_error *
4379 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4380 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4381 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4382 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4383 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4384 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4385 afa376bf 2019-05-09 stsp struct got_repository *repo)
4387 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4388 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4389 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4390 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4391 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4392 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4393 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4394 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4395 ba580f68 2020-03-22 stsp int nentries;
4396 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4397 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4398 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4400 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4402 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4404 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4406 588edf97 2019-05-10 stsp goto done;
4408 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4410 588edf97 2019-05-10 stsp goto done;
4412 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4413 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4418 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4419 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4423 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4424 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4425 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4426 cf066bf8 2019-05-09 stsp char *ondisk_path;
4428 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4429 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4430 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4433 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4434 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
4435 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
4438 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4439 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4440 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4441 cf066bf8 2019-05-09 stsp goto done;
4443 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4444 a7055788 2019-05-09 stsp free(ondisk_path);
4446 cf066bf8 2019-05-09 stsp goto done;
4449 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4450 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
4451 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4453 036813ee 2019-05-09 stsp goto done;
4455 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4457 de18fc63 2019-05-09 stsp goto done;
4458 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4459 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4460 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4461 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4462 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4463 33ad4cbe 2019-05-12 jcs free(logmsg);
4465 9d40349a 2019-05-09 stsp goto done;
4467 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4468 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4469 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4470 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4471 09f5bd90 2019-05-09 stsp goto done;
4473 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4474 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4476 09f5bd90 2019-05-09 stsp goto done;
4477 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4479 ebf99748 2019-05-09 stsp goto done;
4480 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4481 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4482 09f5bd90 2019-05-09 stsp goto done;
4484 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4485 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4487 f2c16586 2019-05-09 stsp goto done;
4488 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4490 f2c16586 2019-05-09 stsp goto done;
4492 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4494 09f5bd90 2019-05-09 stsp goto done;
4496 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4498 ebf99748 2019-05-09 stsp goto done;
4500 588edf97 2019-05-10 stsp if (head_tree)
4501 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4502 588edf97 2019-05-10 stsp if (head_commit)
4503 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4504 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4505 2f17228e 2019-05-12 stsp if (head_ref2) {
4506 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4507 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4508 2f17228e 2019-05-12 stsp err = unlockerr;
4509 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4511 39cd0ff6 2019-07-12 stsp return err;
4514 5c1e53bc 2019-07-28 stsp static const struct got_error *
4515 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4516 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4518 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4519 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4521 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4522 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4523 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4525 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4526 5c1e53bc 2019-07-28 stsp ct_path++;
4528 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4529 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4533 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4534 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4536 5c1e53bc 2019-07-28 stsp return NULL;
4539 f0b75401 2019-08-03 stsp static const struct got_error *
4540 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4542 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4544 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4545 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4546 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4549 f0b75401 2019-08-03 stsp return NULL;
4552 5f8a88c6 2019-08-03 stsp static const struct got_error *
4553 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4554 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4556 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4557 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4559 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4560 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4562 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4563 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4564 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4565 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4566 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4567 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4570 5f8a88c6 2019-08-03 stsp return NULL;
4573 39cd0ff6 2019-07-12 stsp const struct got_error *
4574 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4575 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4576 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4577 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4578 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4579 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4581 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4582 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4583 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4584 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4585 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4586 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4587 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4588 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4589 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4591 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4593 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4595 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4597 39cd0ff6 2019-07-12 stsp goto done;
4599 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4601 39cd0ff6 2019-07-12 stsp goto done;
4603 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4605 39cd0ff6 2019-07-12 stsp goto done;
4607 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4609 39cd0ff6 2019-07-12 stsp goto done;
4611 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4612 5f8a88c6 2019-08-03 stsp &have_staged_files);
4613 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4614 5f8a88c6 2019-08-03 stsp goto done;
4615 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4616 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4618 5f8a88c6 2019-08-03 stsp goto done;
4621 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4622 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4623 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4624 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4625 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4626 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4627 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4629 5c1e53bc 2019-07-28 stsp goto done;
4632 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4633 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4634 39cd0ff6 2019-07-12 stsp goto done;
4637 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4638 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4640 5c1e53bc 2019-07-28 stsp goto done;
4643 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4644 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4645 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4647 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4648 f0b75401 2019-08-03 stsp ct_path++;
4649 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4650 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4651 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4653 b50cabdf 2019-07-12 stsp goto done;
4657 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4658 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4659 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4661 39cd0ff6 2019-07-12 stsp goto done;
4663 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4664 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
4665 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4666 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4667 39cd0ff6 2019-07-12 stsp err = sync_err;
4669 39cd0ff6 2019-07-12 stsp if (fileindex)
4670 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4671 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4672 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4673 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4674 39cd0ff6 2019-07-12 stsp err = unlockerr;
4675 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4676 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4677 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4679 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4680 c4296144 2019-05-09 stsp return err;
4683 8656d6c4 2019-05-20 stsp const char *
4684 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4686 8656d6c4 2019-05-20 stsp return ct->path;
4689 8656d6c4 2019-05-20 stsp unsigned int
4690 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4692 8656d6c4 2019-05-20 stsp return ct->status;
4695 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4696 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4697 818c7501 2019-07-11 stsp struct got_repository *repo;
4700 818c7501 2019-07-11 stsp static const struct got_error *
4701 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4703 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4704 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4705 818c7501 2019-07-11 stsp unsigned char status;
4706 818c7501 2019-07-11 stsp struct stat sb;
4707 818c7501 2019-07-11 stsp char *ondisk_path;
4709 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4710 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4711 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4712 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4714 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4716 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4718 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4719 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
4720 818c7501 2019-07-11 stsp free(ondisk_path);
4722 818c7501 2019-07-11 stsp return err;
4724 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4725 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4726 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4727 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4729 818c7501 2019-07-11 stsp return NULL;
4732 818c7501 2019-07-11 stsp const struct got_error *
4733 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4734 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4735 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4736 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4738 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4739 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4740 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4741 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4742 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4743 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4744 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
4746 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4747 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4748 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4750 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4752 818c7501 2019-07-11 stsp return err;
4754 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4756 818c7501 2019-07-11 stsp goto done;
4758 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4759 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4760 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4763 818c7501 2019-07-11 stsp goto done;
4765 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4767 818c7501 2019-07-11 stsp goto done;
4769 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4771 818c7501 2019-07-11 stsp goto done;
4773 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4775 818c7501 2019-07-11 stsp goto done;
4777 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4780 e51d7b55 2020-01-04 stsp goto done;
4782 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
4784 818c7501 2019-07-11 stsp goto done;
4785 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
4786 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
4787 e51d7b55 2020-01-04 stsp goto done;
4790 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4791 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4793 818c7501 2019-07-11 stsp goto done;
4794 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4796 818c7501 2019-07-11 stsp goto done;
4798 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4800 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4802 818c7501 2019-07-11 stsp goto done;
4804 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4806 818c7501 2019-07-11 stsp goto done;
4808 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4809 818c7501 2019-07-11 stsp worktree->base_commit_id);
4811 818c7501 2019-07-11 stsp goto done;
4812 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4814 818c7501 2019-07-11 stsp goto done;
4816 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4818 818c7501 2019-07-11 stsp goto done;
4820 818c7501 2019-07-11 stsp free(fileindex_path);
4821 818c7501 2019-07-11 stsp free(tmp_branch_name);
4822 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4823 818c7501 2019-07-11 stsp free(branch_ref_name);
4824 818c7501 2019-07-11 stsp if (branch_ref)
4825 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4826 818c7501 2019-07-11 stsp if (wt_branch)
4827 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4828 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
4829 818c7501 2019-07-11 stsp if (err) {
4830 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4831 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4832 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4834 818c7501 2019-07-11 stsp if (*tmp_branch) {
4835 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4836 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4838 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4839 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4840 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4842 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4844 818c7501 2019-07-11 stsp return err;
4847 818c7501 2019-07-11 stsp const struct got_error *
4848 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4849 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4850 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4851 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4853 818c7501 2019-07-11 stsp const struct got_error *err;
4854 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4855 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4856 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4857 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4858 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4860 818c7501 2019-07-11 stsp *commit_id = NULL;
4861 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4862 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4863 3e3a69f1 2019-07-25 stsp *branch = NULL;
4864 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4866 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4868 3e3a69f1 2019-07-25 stsp return err;
4870 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4872 f032f1f7 2019-08-04 stsp goto done;
4874 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4875 f032f1f7 2019-08-04 stsp &have_staged_files);
4876 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4877 f032f1f7 2019-08-04 stsp goto done;
4878 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4879 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4880 3e3a69f1 2019-07-25 stsp goto done;
4883 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4885 f032f1f7 2019-08-04 stsp goto done;
4887 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4889 818c7501 2019-07-11 stsp goto done;
4891 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4893 818c7501 2019-07-11 stsp goto done;
4895 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4897 818c7501 2019-07-11 stsp goto done;
4899 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4901 818c7501 2019-07-11 stsp goto done;
4903 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4904 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4906 818c7501 2019-07-11 stsp goto done;
4908 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4910 818c7501 2019-07-11 stsp goto done;
4912 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4914 818c7501 2019-07-11 stsp goto done;
4916 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4917 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4919 818c7501 2019-07-11 stsp goto done;
4921 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4923 818c7501 2019-07-11 stsp goto done;
4925 818c7501 2019-07-11 stsp free(commit_ref_name);
4926 818c7501 2019-07-11 stsp free(branch_ref_name);
4927 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4928 818c7501 2019-07-11 stsp if (commit_ref)
4929 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4930 818c7501 2019-07-11 stsp if (branch_ref)
4931 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4932 818c7501 2019-07-11 stsp if (err) {
4933 818c7501 2019-07-11 stsp free(*commit_id);
4934 818c7501 2019-07-11 stsp *commit_id = NULL;
4935 818c7501 2019-07-11 stsp if (*tmp_branch) {
4936 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4937 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4939 818c7501 2019-07-11 stsp if (*new_base_branch) {
4940 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4941 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4943 818c7501 2019-07-11 stsp if (*branch) {
4944 818c7501 2019-07-11 stsp got_ref_close(*branch);
4945 818c7501 2019-07-11 stsp *branch = NULL;
4947 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4948 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4949 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4951 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4953 818c7501 2019-07-11 stsp return err;
4956 818c7501 2019-07-11 stsp const struct got_error *
4957 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4959 818c7501 2019-07-11 stsp const struct got_error *err;
4960 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4962 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4964 818c7501 2019-07-11 stsp return err;
4966 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4967 818c7501 2019-07-11 stsp free(tmp_branch_name);
4968 818c7501 2019-07-11 stsp return NULL;
4971 818c7501 2019-07-11 stsp static const struct got_error *
4972 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4973 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4975 0ebf8283 2019-07-24 stsp *logmsg = arg;
4976 818c7501 2019-07-11 stsp return NULL;
4979 818c7501 2019-07-11 stsp static const struct got_error *
4980 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4981 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4982 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4983 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4985 818c7501 2019-07-11 stsp return NULL;
4988 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4989 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4990 01757395 2019-07-12 stsp void *progress_arg;
4991 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4994 01757395 2019-07-12 stsp static const struct got_error *
4995 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4997 01757395 2019-07-12 stsp const struct got_error *err;
4998 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5000 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5002 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5004 01757395 2019-07-12 stsp return err;
5006 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5007 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5008 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5009 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5010 01757395 2019-07-12 stsp return NULL;
5012 01757395 2019-07-12 stsp p = strdup(path);
5013 01757395 2019-07-12 stsp if (p == NULL)
5014 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5016 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5017 01757395 2019-07-12 stsp if (err || new == NULL)
5019 01757395 2019-07-12 stsp return err;
5023 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5025 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5027 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5028 01757395 2019-07-12 stsp free((char *)pe->path);
5030 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
5033 0ebf8283 2019-07-24 stsp static const struct got_error *
5034 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5035 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
5037 818c7501 2019-07-11 stsp const struct got_error *err;
5038 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
5040 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5041 818c7501 2019-07-11 stsp if (err) {
5042 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
5043 818c7501 2019-07-11 stsp goto done;
5044 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
5046 818c7501 2019-07-11 stsp goto done;
5047 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
5049 818c7501 2019-07-11 stsp goto done;
5050 de05890f 2020-03-05 stsp } else if (is_rebase) {
5051 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
5054 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
5056 818c7501 2019-07-11 stsp goto done;
5057 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
5058 818c7501 2019-07-11 stsp free(stored_id);
5059 818c7501 2019-07-11 stsp if (cmp != 0) {
5060 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5061 818c7501 2019-07-11 stsp goto done;
5065 0ebf8283 2019-07-24 stsp if (commit_ref)
5066 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5067 0ebf8283 2019-07-24 stsp return err;
5070 0ebf8283 2019-07-24 stsp static const struct got_error *
5071 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
5072 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
5073 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5074 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
5075 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5076 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5078 0ebf8283 2019-07-24 stsp const struct got_error *err;
5079 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5080 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
5081 3e3a69f1 2019-07-25 stsp char *fileindex_path;
5083 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5085 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5087 0ebf8283 2019-07-24 stsp return err;
5089 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
5090 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
5091 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
5092 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
5093 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
5094 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
5095 818c7501 2019-07-11 stsp if (commit_ref)
5096 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5097 818c7501 2019-07-11 stsp return err;
5100 818c7501 2019-07-11 stsp const struct got_error *
5101 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5102 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5103 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5104 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5105 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5106 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5108 0ebf8283 2019-07-24 stsp const struct got_error *err;
5109 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5111 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5113 0ebf8283 2019-07-24 stsp return err;
5115 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
5117 0ebf8283 2019-07-24 stsp goto done;
5119 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5120 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5121 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5123 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5124 0ebf8283 2019-07-24 stsp return err;
5127 0ebf8283 2019-07-24 stsp const struct got_error *
5128 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5129 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5130 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5131 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5132 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5133 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5135 0ebf8283 2019-07-24 stsp const struct got_error *err;
5136 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5138 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5140 0ebf8283 2019-07-24 stsp return err;
5142 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5144 0ebf8283 2019-07-24 stsp goto done;
5146 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5147 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5148 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5150 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5151 0ebf8283 2019-07-24 stsp return err;
5154 0ebf8283 2019-07-24 stsp static const struct got_error *
5155 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
5156 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5157 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5158 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5159 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
5161 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
5162 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5163 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5164 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5165 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
5166 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5167 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
5169 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5170 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
5172 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5174 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5176 3e3a69f1 2019-07-25 stsp return err;
5178 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5179 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
5180 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
5181 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
5183 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
5184 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
5185 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
5186 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
5188 01757395 2019-07-12 stsp if (merged_paths) {
5189 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5190 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
5191 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
5192 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5195 01757395 2019-07-12 stsp goto done;
5198 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5199 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5201 01757395 2019-07-12 stsp goto done;
5204 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5205 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
5206 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5208 a0e95631 2019-07-12 stsp goto done;
5209 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5210 a0e95631 2019-07-12 stsp goto done;
5213 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5215 edd02c5e 2019-07-11 stsp goto done;
5217 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5219 818c7501 2019-07-11 stsp goto done;
5221 5943eee2 2019-08-13 stsp if (new_logmsg) {
5222 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
5223 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
5224 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5225 5943eee2 2019-08-13 stsp goto done;
5228 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5230 5943eee2 2019-08-13 stsp goto done;
5233 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
5234 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5235 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
5236 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
5237 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5239 a0e95631 2019-07-12 stsp goto done;
5241 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
5243 a0e95631 2019-07-12 stsp goto done;
5245 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5247 a0e95631 2019-07-12 stsp goto done;
5249 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5250 72fd46fa 2019-09-06 stsp fileindex, 0);
5251 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5252 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
5253 a0e95631 2019-07-12 stsp err = sync_err;
5255 a0e95631 2019-07-12 stsp free(fileindex_path);
5256 a0e95631 2019-07-12 stsp free(head_commit_id);
5257 a0e95631 2019-07-12 stsp if (head_ref)
5258 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
5259 818c7501 2019-07-11 stsp if (err) {
5260 818c7501 2019-07-11 stsp free(*new_commit_id);
5261 818c7501 2019-07-11 stsp *new_commit_id = NULL;
5263 818c7501 2019-07-11 stsp return err;
5266 818c7501 2019-07-11 stsp const struct got_error *
5267 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5268 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5269 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5270 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5271 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
5273 0ebf8283 2019-07-24 stsp const struct got_error *err;
5274 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5275 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5276 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5278 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5280 0ebf8283 2019-07-24 stsp return err;
5282 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5284 0ebf8283 2019-07-24 stsp goto done;
5285 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5287 0ebf8283 2019-07-24 stsp goto done;
5288 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5289 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5290 0ebf8283 2019-07-24 stsp goto done;
5293 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5294 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5296 0ebf8283 2019-07-24 stsp if (commit_ref)
5297 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5298 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5299 0ebf8283 2019-07-24 stsp free(commit_id);
5300 0ebf8283 2019-07-24 stsp return err;
5303 0ebf8283 2019-07-24 stsp const struct got_error *
5304 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5305 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5306 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5307 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5308 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
5309 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5311 0ebf8283 2019-07-24 stsp const struct got_error *err;
5312 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5313 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5315 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5317 0ebf8283 2019-07-24 stsp return err;
5319 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5321 0ebf8283 2019-07-24 stsp goto done;
5323 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5324 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5326 0ebf8283 2019-07-24 stsp if (commit_ref)
5327 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5328 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5329 0ebf8283 2019-07-24 stsp return err;
5332 0ebf8283 2019-07-24 stsp const struct got_error *
5333 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
5334 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5336 3e3a69f1 2019-07-25 stsp if (fileindex)
5337 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5338 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
5341 69844fba 2019-07-11 stsp static const struct got_error *
5342 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
5344 69844fba 2019-07-11 stsp const struct got_error *err;
5345 69844fba 2019-07-11 stsp struct got_reference *ref;
5347 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
5348 69844fba 2019-07-11 stsp if (err) {
5349 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
5350 69844fba 2019-07-11 stsp return NULL;
5351 69844fba 2019-07-11 stsp return err;
5354 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
5355 69844fba 2019-07-11 stsp got_ref_close(ref);
5356 69844fba 2019-07-11 stsp return err;
5359 69844fba 2019-07-11 stsp static const struct got_error *
5360 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5362 69844fba 2019-07-11 stsp const struct got_error *err;
5363 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5364 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5366 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5368 69844fba 2019-07-11 stsp goto done;
5369 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5371 69844fba 2019-07-11 stsp goto done;
5373 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5375 69844fba 2019-07-11 stsp goto done;
5376 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5378 69844fba 2019-07-11 stsp goto done;
5380 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5382 69844fba 2019-07-11 stsp goto done;
5383 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5385 69844fba 2019-07-11 stsp goto done;
5387 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5389 69844fba 2019-07-11 stsp goto done;
5390 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5392 69844fba 2019-07-11 stsp goto done;
5395 69844fba 2019-07-11 stsp free(tmp_branch_name);
5396 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5397 69844fba 2019-07-11 stsp free(branch_ref_name);
5398 69844fba 2019-07-11 stsp free(commit_ref_name);
5399 69844fba 2019-07-11 stsp return err;
5402 818c7501 2019-07-11 stsp const struct got_error *
5403 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5404 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5405 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5406 818c7501 2019-07-11 stsp struct got_repository *repo)
5408 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5409 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5411 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5413 818c7501 2019-07-11 stsp return err;
5415 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5417 818c7501 2019-07-11 stsp goto done;
5419 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5421 818c7501 2019-07-11 stsp goto done;
5423 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5425 818c7501 2019-07-11 stsp goto done;
5427 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5429 3e3a69f1 2019-07-25 stsp if (fileindex)
5430 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5431 818c7501 2019-07-11 stsp free(new_head_commit_id);
5432 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5433 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5434 818c7501 2019-07-11 stsp err = unlockerr;
5435 818c7501 2019-07-11 stsp return err;
5438 818c7501 2019-07-11 stsp const struct got_error *
5439 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5440 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5441 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5442 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5444 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5445 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5446 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5447 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5448 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5449 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5451 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5453 818c7501 2019-07-11 stsp return err;
5455 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5456 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5458 818c7501 2019-07-11 stsp goto done;
5460 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5462 818c7501 2019-07-11 stsp goto done;
5465 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5466 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5467 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5469 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5471 818c7501 2019-07-11 stsp goto done;
5473 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5475 818c7501 2019-07-11 stsp goto done;
5477 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5478 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5480 ca355955 2019-07-12 stsp goto done;
5482 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5484 ca355955 2019-07-12 stsp goto done;
5486 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5488 818c7501 2019-07-11 stsp goto done;
5490 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5491 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5492 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5493 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5494 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5495 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5496 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5497 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5498 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5500 1f1abb7e 2019-08-08 stsp goto sync;
5502 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5503 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5505 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5506 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5507 ca355955 2019-07-12 stsp err = sync_err;
5509 818c7501 2019-07-11 stsp got_ref_close(resolved);
5510 a3a2faf2 2019-07-12 stsp free(tree_id);
5511 818c7501 2019-07-11 stsp free(commit_id);
5512 0ebf8283 2019-07-24 stsp if (fileindex)
5513 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5514 0ebf8283 2019-07-24 stsp free(fileindex_path);
5516 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5517 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5518 0ebf8283 2019-07-24 stsp err = unlockerr;
5519 0ebf8283 2019-07-24 stsp return err;
5522 0ebf8283 2019-07-24 stsp const struct got_error *
5523 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5524 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5525 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5526 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5528 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5529 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5530 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5531 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5532 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5533 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5534 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5535 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5537 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5538 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5539 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5540 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5542 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5544 0ebf8283 2019-07-24 stsp return err;
5546 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5548 0ebf8283 2019-07-24 stsp goto done;
5550 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5551 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5552 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5555 0ebf8283 2019-07-24 stsp goto done;
5557 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5559 0ebf8283 2019-07-24 stsp goto done;
5561 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5563 0ebf8283 2019-07-24 stsp goto done;
5565 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5566 0ebf8283 2019-07-24 stsp worktree);
5568 0ebf8283 2019-07-24 stsp goto done;
5570 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5573 0ebf8283 2019-07-24 stsp goto done;
5575 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5577 0ebf8283 2019-07-24 stsp goto done;
5579 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5581 0ebf8283 2019-07-24 stsp goto done;
5583 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5584 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5586 0ebf8283 2019-07-24 stsp goto done;
5587 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5589 0ebf8283 2019-07-24 stsp goto done;
5590 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5591 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5592 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5593 0ebf8283 2019-07-24 stsp goto done;
5596 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5597 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5599 0ebf8283 2019-07-24 stsp goto done;
5600 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5602 0ebf8283 2019-07-24 stsp goto done;
5604 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5606 0ebf8283 2019-07-24 stsp goto done;
5608 0ebf8283 2019-07-24 stsp free(fileindex_path);
5609 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5610 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5611 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5612 0ebf8283 2019-07-24 stsp if (wt_branch)
5613 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5614 0ebf8283 2019-07-24 stsp if (err) {
5615 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5616 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5617 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5619 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5620 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5621 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5623 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5624 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5625 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5626 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5628 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5630 0ebf8283 2019-07-24 stsp return err;
5633 0ebf8283 2019-07-24 stsp const struct got_error *
5634 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5635 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5637 3e3a69f1 2019-07-25 stsp if (fileindex)
5638 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5639 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5642 0ebf8283 2019-07-24 stsp const struct got_error *
5643 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5644 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5646 0ebf8283 2019-07-24 stsp const struct got_error *err;
5647 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5649 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5651 0ebf8283 2019-07-24 stsp return err;
5653 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5654 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5655 0ebf8283 2019-07-24 stsp return NULL;
5658 0ebf8283 2019-07-24 stsp const struct got_error *
5659 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5660 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5661 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5662 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5664 0ebf8283 2019-07-24 stsp const struct got_error *err;
5665 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5666 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5667 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5668 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5669 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5670 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5672 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5673 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5674 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5675 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5677 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5679 3e3a69f1 2019-07-25 stsp return err;
5681 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5683 f032f1f7 2019-08-04 stsp goto done;
5685 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5686 f032f1f7 2019-08-04 stsp &have_staged_files);
5687 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5688 f032f1f7 2019-08-04 stsp goto done;
5689 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5690 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5691 3e3a69f1 2019-07-25 stsp goto done;
5694 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5696 f032f1f7 2019-08-04 stsp goto done;
5698 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5700 0ebf8283 2019-07-24 stsp goto done;
5702 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5704 0ebf8283 2019-07-24 stsp goto done;
5706 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5707 0ebf8283 2019-07-24 stsp worktree);
5709 0ebf8283 2019-07-24 stsp goto done;
5711 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5713 0ebf8283 2019-07-24 stsp goto done;
5715 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5717 0ebf8283 2019-07-24 stsp goto done;
5718 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5720 0ebf8283 2019-07-24 stsp goto done;
5722 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5724 0ebf8283 2019-07-24 stsp goto done;
5725 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5727 0ebf8283 2019-07-24 stsp goto done;
5729 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5731 0ebf8283 2019-07-24 stsp goto done;
5733 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5734 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5735 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5736 0ebf8283 2019-07-24 stsp if (commit_ref)
5737 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5738 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5739 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5740 0ebf8283 2019-07-24 stsp if (err) {
5741 0ebf8283 2019-07-24 stsp free(*commit_id);
5742 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5743 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5744 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5745 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5746 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5747 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5749 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5750 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5751 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5753 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5755 0ebf8283 2019-07-24 stsp return err;
5758 0ebf8283 2019-07-24 stsp static const struct got_error *
5759 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5761 0ebf8283 2019-07-24 stsp const struct got_error *err;
5762 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5763 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5765 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5767 0ebf8283 2019-07-24 stsp goto done;
5768 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5770 0ebf8283 2019-07-24 stsp goto done;
5772 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5773 0ebf8283 2019-07-24 stsp worktree);
5775 0ebf8283 2019-07-24 stsp goto done;
5776 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5778 0ebf8283 2019-07-24 stsp goto done;
5780 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5782 0ebf8283 2019-07-24 stsp goto done;
5783 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5785 0ebf8283 2019-07-24 stsp goto done;
5787 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5789 0ebf8283 2019-07-24 stsp goto done;
5790 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5792 0ebf8283 2019-07-24 stsp goto done;
5794 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5795 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5796 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5797 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5798 0ebf8283 2019-07-24 stsp return err;
5801 0ebf8283 2019-07-24 stsp const struct got_error *
5802 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5803 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5804 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5805 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5807 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5808 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5809 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5810 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5811 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5813 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5815 0ebf8283 2019-07-24 stsp return err;
5817 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5818 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5820 0ebf8283 2019-07-24 stsp goto done;
5822 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5824 0ebf8283 2019-07-24 stsp goto done;
5826 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5828 0ebf8283 2019-07-24 stsp goto done;
5830 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5831 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5833 0ebf8283 2019-07-24 stsp goto done;
5835 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5837 0ebf8283 2019-07-24 stsp goto done;
5839 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5841 0ebf8283 2019-07-24 stsp goto done;
5843 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5844 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5845 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5846 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5847 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5848 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5849 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5850 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5851 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5853 1f1abb7e 2019-08-08 stsp goto sync;
5855 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5856 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5858 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5859 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5860 0ebf8283 2019-07-24 stsp err = sync_err;
5862 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5863 0ebf8283 2019-07-24 stsp free(tree_id);
5864 818c7501 2019-07-11 stsp free(fileindex_path);
5866 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5867 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5868 818c7501 2019-07-11 stsp err = unlockerr;
5869 818c7501 2019-07-11 stsp return err;
5872 0ebf8283 2019-07-24 stsp const struct got_error *
5873 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5874 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5875 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5877 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5878 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5879 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5881 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5883 0ebf8283 2019-07-24 stsp return err;
5885 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5886 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5888 0ebf8283 2019-07-24 stsp goto done;
5890 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5892 0ebf8283 2019-07-24 stsp goto done;
5894 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5896 0ebf8283 2019-07-24 stsp goto done;
5898 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5900 0ebf8283 2019-07-24 stsp goto done;
5902 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5904 3e3a69f1 2019-07-25 stsp if (fileindex)
5905 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5906 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5907 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5908 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5909 0ebf8283 2019-07-24 stsp err = unlockerr;
5910 0ebf8283 2019-07-24 stsp return err;
5913 0ebf8283 2019-07-24 stsp const struct got_error *
5914 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5915 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5917 0ebf8283 2019-07-24 stsp const struct got_error *err;
5918 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5920 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5922 0ebf8283 2019-07-24 stsp return err;
5924 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5926 0ebf8283 2019-07-24 stsp goto done;
5928 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5930 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5931 2822a352 2019-10-15 stsp return err;
5934 2822a352 2019-10-15 stsp const struct got_error *
5935 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5936 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5937 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
5938 2822a352 2019-10-15 stsp struct got_repository *repo)
5940 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
5941 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5942 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
5944 2822a352 2019-10-15 stsp *fileindex = NULL;
5945 2822a352 2019-10-15 stsp *branch_ref = NULL;
5946 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5948 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
5950 2822a352 2019-10-15 stsp return err;
5952 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5953 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5954 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
5955 2822a352 2019-10-15 stsp "update -b or different branch name required");
5956 2822a352 2019-10-15 stsp goto done;
5959 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5961 2822a352 2019-10-15 stsp goto done;
5963 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
5964 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
5965 2822a352 2019-10-15 stsp ok_arg.repo = repo;
5966 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5969 2822a352 2019-10-15 stsp goto done;
5971 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
5973 2822a352 2019-10-15 stsp goto done;
5975 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
5976 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
5978 2822a352 2019-10-15 stsp if (err) {
5979 2822a352 2019-10-15 stsp if (*branch_ref) {
5980 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
5981 2822a352 2019-10-15 stsp *branch_ref = NULL;
5983 2822a352 2019-10-15 stsp if (*base_branch_ref) {
5984 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
5985 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5987 2822a352 2019-10-15 stsp if (*fileindex) {
5988 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
5989 2822a352 2019-10-15 stsp *fileindex = NULL;
5991 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
5993 0cb83759 2019-08-03 stsp return err;
5996 2822a352 2019-10-15 stsp const struct got_error *
5997 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
5998 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5999 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6000 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6001 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6003 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6004 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6005 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6007 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6009 2822a352 2019-10-15 stsp goto done;
6011 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6013 2822a352 2019-10-15 stsp goto done;
6015 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6016 2822a352 2019-10-15 stsp worktree->path_prefix);
6018 2822a352 2019-10-15 stsp goto done;
6020 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6022 2822a352 2019-10-15 stsp goto done;
6024 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6025 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6027 2822a352 2019-10-15 stsp goto sync;
6029 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6031 2822a352 2019-10-15 stsp goto sync;
6033 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
6035 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6036 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
6037 2822a352 2019-10-15 stsp err = sync_err;
6040 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
6041 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6042 2822a352 2019-10-15 stsp err = unlockerr;
6043 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6045 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
6046 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6047 2822a352 2019-10-15 stsp err = unlockerr;
6048 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6050 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
6051 2822a352 2019-10-15 stsp free(fileindex_path);
6052 2822a352 2019-10-15 stsp free(tree_id);
6054 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6055 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6056 2822a352 2019-10-15 stsp err = unlockerr;
6057 2822a352 2019-10-15 stsp return err;
6060 2822a352 2019-10-15 stsp const struct got_error *
6061 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
6062 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6063 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6065 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
6067 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
6069 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
6071 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
6072 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6073 8b692cd0 2019-10-21 stsp err = unlockerr;
6074 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6076 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
6077 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6078 8b692cd0 2019-10-21 stsp err = unlockerr;
6079 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6081 8b692cd0 2019-10-21 stsp return err;
6084 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
6085 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
6086 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6087 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6088 2db2652d 2019-08-07 stsp struct got_repository *repo;
6089 2db2652d 2019-08-07 stsp int have_changes;
6092 2db2652d 2019-08-07 stsp const struct got_error *
6093 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
6094 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6095 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6096 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6098 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
6099 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
6100 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
6101 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
6102 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
6103 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
6105 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
6106 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
6107 8b13ce36 2019-08-08 stsp return NULL;
6108 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6109 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
6111 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6112 735ef5ac 2019-08-03 stsp if (ie == NULL)
6113 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6115 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6116 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6117 735ef5ac 2019-08-03 stsp relpath) == -1)
6118 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
6120 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
6121 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
6122 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6123 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
6126 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
6127 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6128 3aa5969e 2019-08-06 stsp goto done;
6129 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
6130 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
6131 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
6132 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6133 735ef5ac 2019-08-03 stsp goto done;
6136 2db2652d 2019-08-07 stsp a->have_changes = 1;
6138 735ef5ac 2019-08-03 stsp p = in_repo_path;
6139 735ef5ac 2019-08-03 stsp while (p[0] == '/')
6141 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
6142 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
6143 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
6145 735ef5ac 2019-08-03 stsp free(in_repo_path);
6146 dc424a06 2019-08-07 stsp return err;
6149 2db2652d 2019-08-07 stsp struct stage_path_arg {
6150 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6151 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6152 2db2652d 2019-08-07 stsp struct got_repository *repo;
6153 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
6154 2db2652d 2019-08-07 stsp void *status_arg;
6155 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
6156 2db2652d 2019-08-07 stsp void *patch_arg;
6157 7b5dc508 2019-10-28 stsp int staged_something;
6160 2db2652d 2019-08-07 stsp static const struct got_error *
6161 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
6162 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6163 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6164 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6166 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
6167 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
6168 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
6169 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
6170 0cb83759 2019-08-03 stsp uint32_t stage;
6171 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
6173 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
6174 8b13ce36 2019-08-08 stsp return NULL;
6176 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6177 d3e7c587 2019-08-03 stsp if (ie == NULL)
6178 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6180 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6181 2db2652d 2019-08-07 stsp relpath)== -1)
6182 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
6184 0cb83759 2019-08-03 stsp switch (status) {
6185 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
6186 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
6187 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6188 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
6189 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6190 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6191 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
6194 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
6197 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
6198 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
6199 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
6200 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
6201 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
6205 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
6206 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
6209 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6210 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6211 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6212 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
6214 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
6215 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6216 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6217 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6219 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6220 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
6221 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
6223 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
6224 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
6226 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6227 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6228 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
6229 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
6232 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6234 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6235 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6239 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
6240 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6241 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6242 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6244 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6245 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6248 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
6250 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
6251 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6253 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
6254 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
6257 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6261 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
6262 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
6263 dc424a06 2019-08-07 stsp free(path_content);
6264 2db2652d 2019-08-07 stsp free(ondisk_path);
6265 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
6266 0ebf8283 2019-07-24 stsp return err;
6269 0cb83759 2019-08-03 stsp const struct got_error *
6270 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
6271 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
6272 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
6273 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6274 1e71573e 2019-08-03 stsp struct got_repository *repo)
6276 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6277 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
6278 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6279 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
6280 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
6281 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
6282 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
6283 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
6285 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6287 0cb83759 2019-08-03 stsp return err;
6289 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
6290 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
6292 735ef5ac 2019-08-03 stsp goto done;
6293 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6295 735ef5ac 2019-08-03 stsp goto done;
6296 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6298 0cb83759 2019-08-03 stsp goto done;
6300 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
6301 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
6302 2db2652d 2019-08-07 stsp oka.worktree = worktree;
6303 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
6304 2db2652d 2019-08-07 stsp oka.repo = repo;
6305 2db2652d 2019-08-07 stsp oka.have_changes = 0;
6306 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6307 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6308 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
6310 735ef5ac 2019-08-03 stsp goto done;
6312 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
6313 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6314 2db2652d 2019-08-07 stsp goto done;
6317 2db2652d 2019-08-07 stsp spa.worktree = worktree;
6318 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
6319 2db2652d 2019-08-07 stsp spa.repo = repo;
6320 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
6321 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
6322 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
6323 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
6324 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
6325 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6326 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6327 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
6329 2db2652d 2019-08-07 stsp goto done;
6331 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
6332 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6333 7b5dc508 2019-10-28 stsp goto done;
6336 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6337 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
6338 0cb83759 2019-08-03 stsp err = sync_err;
6340 735ef5ac 2019-08-03 stsp if (head_ref)
6341 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
6342 735ef5ac 2019-08-03 stsp free(head_commit_id);
6343 0cb83759 2019-08-03 stsp free(fileindex_path);
6344 0cb83759 2019-08-03 stsp if (fileindex)
6345 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
6346 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6347 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
6348 0cb83759 2019-08-03 stsp err = unlockerr;
6349 0cb83759 2019-08-03 stsp return err;
6352 ad493afc 2019-08-03 stsp struct unstage_path_arg {
6353 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
6354 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
6355 ad493afc 2019-08-03 stsp struct got_repository *repo;
6356 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
6357 ad493afc 2019-08-03 stsp void *progress_arg;
6358 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
6359 2e1f37b0 2019-08-08 stsp void *patch_arg;
6362 2e1f37b0 2019-08-08 stsp static const struct got_error *
6363 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
6364 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
6365 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
6366 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
6367 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
6369 2e1f37b0 2019-08-08 stsp const struct got_error *err;
6370 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
6371 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6372 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6373 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
6374 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
6375 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
6376 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
6377 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
6378 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6379 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
6381 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6382 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6384 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
6386 2e1f37b0 2019-08-08 stsp return err;
6387 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6389 2e1f37b0 2019-08-08 stsp goto done;
6391 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6393 2e1f37b0 2019-08-08 stsp goto done;
6395 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6397 2e1f37b0 2019-08-08 stsp goto done;
6399 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6401 2e1f37b0 2019-08-08 stsp goto done;
6403 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6405 2e1f37b0 2019-08-08 stsp goto done;
6407 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6409 2e1f37b0 2019-08-08 stsp goto done;
6411 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
6412 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
6413 2e1f37b0 2019-08-08 stsp goto done;
6416 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
6417 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
6418 2e1f37b0 2019-08-08 stsp goto done;
6421 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
6422 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6424 2e1f37b0 2019-08-08 stsp goto done;
6426 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
6427 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
6429 2e1f37b0 2019-08-08 stsp goto done;
6430 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
6431 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
6433 2e1f37b0 2019-08-08 stsp goto done;
6435 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
6436 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
6437 2e1f37b0 2019-08-08 stsp goto done;
6439 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
6440 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
6441 2e1f37b0 2019-08-08 stsp goto done;
6443 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6444 2e1f37b0 2019-08-08 stsp int choice;
6445 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
6446 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
6447 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
6448 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
6450 2e1f37b0 2019-08-08 stsp goto done;
6451 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
6452 2e1f37b0 2019-08-08 stsp have_content = 1;
6454 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
6455 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
6458 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
6459 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6460 f1e81a05 2019-08-10 stsp outfile, rejectfile);
6462 2e1f37b0 2019-08-08 stsp free(label1);
6464 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
6465 2e1f37b0 2019-08-08 stsp if (staged_blob)
6466 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
6467 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
6468 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
6469 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
6470 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
6471 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
6472 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
6473 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6474 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
6475 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
6476 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
6477 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
6478 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
6479 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
6480 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
6481 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
6482 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6483 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
6484 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
6485 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6487 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
6488 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
6489 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
6490 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6491 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
6492 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
6493 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6495 2e1f37b0 2019-08-08 stsp free(args);
6497 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
6500 2e1f37b0 2019-08-08 stsp if (changes)
6501 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
6502 2e1f37b0 2019-08-08 stsp free(path1);
6503 2e1f37b0 2019-08-08 stsp free(path2);
6504 2e1f37b0 2019-08-08 stsp return err;
6507 ad493afc 2019-08-03 stsp static const struct got_error *
6508 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
6509 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
6510 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6511 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6513 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
6514 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
6515 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
6516 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6517 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
6518 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
6519 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
6520 ad493afc 2019-08-03 stsp int local_changes_subsumed;
6521 9bc94a15 2019-08-03 stsp struct stat sb;
6523 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
6524 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
6525 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
6526 2e1f37b0 2019-08-08 stsp return NULL;
6528 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6529 ad493afc 2019-08-03 stsp if (ie == NULL)
6530 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6532 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6534 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
6536 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
6537 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
6539 f69721c3 2019-10-21 stsp goto done;
6540 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6541 f69721c3 2019-10-21 stsp id_str) == -1) {
6542 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
6543 f69721c3 2019-10-21 stsp goto done;
6546 ad493afc 2019-08-03 stsp switch (staged_status) {
6547 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
6548 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
6549 ad493afc 2019-08-03 stsp blob_id, 8192);
6552 ad493afc 2019-08-03 stsp /* fall through */
6553 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
6554 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6555 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
6556 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6557 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6558 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6561 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6564 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6565 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6566 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6567 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6568 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6569 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6571 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6572 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6573 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6574 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6578 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6579 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6580 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6582 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6583 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6584 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6585 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
6586 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
6587 f69721c3 2019-10-21 stsp a->progress_arg);
6588 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6589 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6590 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6591 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6592 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6595 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6596 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6599 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6600 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6601 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6602 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6603 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6604 ad493afc 2019-08-03 stsp if (err == NULL)
6605 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6606 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6608 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6609 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6610 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6611 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6612 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6615 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6617 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6618 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6622 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6623 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
6624 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
6627 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6631 ad493afc 2019-08-03 stsp free(ondisk_path);
6632 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6633 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6634 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6635 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6636 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6637 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6638 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6639 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6640 ad493afc 2019-08-03 stsp if (blob_base)
6641 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6642 ad493afc 2019-08-03 stsp if (blob_staged)
6643 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6644 f69721c3 2019-10-21 stsp free(id_str);
6645 f69721c3 2019-10-21 stsp free(label_orig);
6646 ad493afc 2019-08-03 stsp return err;
6649 ad493afc 2019-08-03 stsp const struct got_error *
6650 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6651 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6652 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6653 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6654 ad493afc 2019-08-03 stsp struct got_repository *repo)
6656 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6657 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6658 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6659 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6660 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6662 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6664 ad493afc 2019-08-03 stsp return err;
6666 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6668 ad493afc 2019-08-03 stsp goto done;
6670 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6671 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6672 ad493afc 2019-08-03 stsp upa.repo = repo;
6673 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6674 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6675 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6676 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6677 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6678 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6679 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
6681 ad493afc 2019-08-03 stsp goto done;
6684 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6685 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6686 ad493afc 2019-08-03 stsp err = sync_err;
6688 ad493afc 2019-08-03 stsp free(fileindex_path);
6689 ad493afc 2019-08-03 stsp if (fileindex)
6690 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6691 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6692 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6693 ad493afc 2019-08-03 stsp err = unlockerr;
6694 ad493afc 2019-08-03 stsp return err;
