2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 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 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
709 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
710 68c76935 2019-02-19 stsp if (f2 == NULL) {
711 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", 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 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
806 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", 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);
813 2a57020b 2019-02-20 stsp unlink(merged_path);
818 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
819 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
820 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
821 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
822 6353ad76 2019-02-08 stsp free(merged_path);
823 af54ae4a 2019-02-19 stsp free(base_path);
824 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
825 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
826 46b6ee73 2019-06-04 stsp free(blob_orig_path);
828 14c901f1 2019-08-08 stsp return err;
832 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
833 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
834 14c901f1 2019-08-08 stsp * acts as the second derived version.
836 14c901f1 2019-08-08 stsp static const struct got_error *
837 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
838 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
839 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
840 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
841 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
842 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
844 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
845 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
846 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
847 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
849 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
851 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
852 14c901f1 2019-08-08 stsp if (parent == NULL)
853 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
855 14c901f1 2019-08-08 stsp free(base_path);
856 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
857 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
858 14c901f1 2019-08-08 stsp base_path = NULL;
862 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
865 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
866 14c901f1 2019-08-08 stsp blob_deriv);
870 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
873 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
874 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
875 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
879 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
880 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
881 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
883 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
884 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
885 14c901f1 2019-08-08 stsp free(base_path);
886 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
887 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
888 14c901f1 2019-08-08 stsp free(blob_deriv_path);
890 6353ad76 2019-02-08 stsp free(id_str);
891 818c7501 2019-07-11 stsp free(label_deriv);
892 4a1ddfc2 2019-01-12 stsp return err;
895 4a1ddfc2 2019-01-12 stsp static const struct got_error *
896 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
897 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
898 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
899 13d9040b 2019-03-27 stsp int update_timestamps)
901 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
903 13d9040b 2019-03-27 stsp if (ie == NULL)
904 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
906 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
907 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
908 13d9040b 2019-03-27 stsp update_timestamps);
910 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
911 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
912 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
914 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
916 13d9040b 2019-03-27 stsp return err;
919 1ebedb77 2019-10-19 stsp static mode_t
920 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
922 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
924 1ebedb77 2019-10-19 stsp if (executable) {
925 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
926 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
927 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
928 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
929 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
930 1ebedb77 2019-10-19 stsp return st_mode | xbits;
933 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
936 13d9040b 2019-03-27 stsp static const struct got_error *
937 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
938 4b55f459 2019-09-08 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
939 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
940 4b55f459 2019-09-08 stsp int reverting_versioned_file, struct got_repository *repo,
941 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
943 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
944 507dc3bb 2018-12-29 stsp int fd = -1;
945 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
946 507dc3bb 2018-12-29 stsp int update = 0;
947 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
949 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
950 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
951 9d31a1d8 2018-03-11 stsp if (fd == -1) {
952 21908da4 2019-01-13 stsp if (errno == ENOENT) {
953 21908da4 2019-01-13 stsp char *parent = dirname(path);
954 21908da4 2019-01-13 stsp if (parent == NULL)
955 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
956 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
958 21908da4 2019-01-13 stsp return err;
959 21908da4 2019-01-13 stsp fd = open(ondisk_path,
960 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
961 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
962 21908da4 2019-01-13 stsp if (fd == -1)
963 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
964 230a42bd 2019-05-11 jcs ondisk_path);
965 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
966 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
967 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
968 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
971 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
972 507dc3bb 2018-12-29 stsp ondisk_path);
975 507dc3bb 2018-12-29 stsp update = 1;
978 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
981 a378724f 2019-02-10 stsp if (restoring_missing_file)
982 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
983 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
984 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
986 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
987 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
991 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
993 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
994 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
997 9d31a1d8 2018-03-11 stsp if (len > 0) {
998 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
999 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1000 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1001 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1002 b87c6f83 2018-12-24 stsp goto done;
1003 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1004 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1005 b87c6f83 2018-12-24 stsp goto done;
1007 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1009 9d31a1d8 2018-03-11 stsp } while (len != 0);
1011 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1012 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1013 816dc654 2019-02-16 stsp goto done;
1016 507dc3bb 2018-12-29 stsp if (update) {
1017 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1018 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1019 230a42bd 2019-05-11 jcs ondisk_path);
1020 2a57020b 2019-02-20 stsp unlink(tmppath);
1021 68ed9ba5 2019-02-10 stsp goto done;
1025 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1026 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1027 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1028 1ebedb77 2019-10-19 stsp goto done;
1032 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1033 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1034 507dc3bb 2018-12-29 stsp free(tmppath);
1035 6353ad76 2019-02-08 stsp return err;
1038 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1039 6353ad76 2019-02-08 stsp static const struct got_error *
1040 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1042 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1043 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1044 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1045 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1046 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1048 7154f6ce 2019-03-27 stsp int i = 0;
1049 7154f6ce 2019-03-27 stsp char *line;
1050 7154f6ce 2019-03-27 stsp size_t len;
1051 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1053 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1054 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1055 7154f6ce 2019-03-27 stsp if (line == NULL) {
1056 7154f6ce 2019-03-27 stsp if (feof(f))
1058 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1062 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1063 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1065 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1071 7154f6ce 2019-03-27 stsp return err;
1074 e2b1e152 2019-07-13 stsp static int
1075 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1077 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1078 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1081 1ebedb77 2019-10-19 stsp static int
1082 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1084 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1085 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1086 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1087 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1088 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1089 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1092 c363b2c1 2019-08-03 stsp static unsigned char
1093 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1095 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1096 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1097 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1098 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1099 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1100 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1101 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1103 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1107 7154f6ce 2019-03-27 stsp static const struct got_error *
1108 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1109 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1110 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1112 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1113 6353ad76 2019-02-08 stsp struct got_object_id id;
1114 6353ad76 2019-02-08 stsp size_t hdrlen;
1115 1338848f 2019-12-13 stsp int fd = -1;
1116 6353ad76 2019-02-08 stsp FILE *f = NULL;
1117 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1118 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1119 6353ad76 2019-02-08 stsp size_t flen, blen;
1120 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1122 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1125 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1126 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1127 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1129 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1130 7f91a133 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1131 7f91a133 2019-12-13 stsp if (fd == -1 && errno != ENOENT)
1132 7f91a133 2019-12-13 stsp return got_error_from_errno2("openat", abspath);
1134 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1135 7f91a133 2019-12-13 stsp if (fd == -1 && errno != ENOENT)
1136 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1138 1338848f 2019-12-13 stsp if (fd == -1 || fstat(fd, sb) == -1) {
1139 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1140 abb4604f 2019-07-27 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1141 abb4604f 2019-07-27 stsp *status = GOT_STATUS_MISSING;
1143 abb4604f 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1144 1338848f 2019-12-13 stsp goto done;
1146 1338848f 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1147 1338848f 2019-12-13 stsp goto done;
1150 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1151 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1152 1338848f 2019-12-13 stsp goto done;
1155 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1156 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1157 1338848f 2019-12-13 stsp goto done;
1158 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1159 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1160 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1161 1338848f 2019-12-13 stsp goto done;
1164 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1165 1338848f 2019-12-13 stsp goto done;
1167 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1168 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1169 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1171 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1173 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1175 1338848f 2019-12-13 stsp goto done;
1177 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1178 6353ad76 2019-02-08 stsp if (f == NULL) {
1179 339c298e 2019-07-27 stsp err = got_error_from_errno2("fopen", abspath);
1180 6353ad76 2019-02-08 stsp goto done;
1183 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1185 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1186 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1188 7154f6ce 2019-03-27 stsp goto done;
1189 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1190 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1191 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1192 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1193 7154f6ce 2019-03-27 stsp goto done;
1195 6353ad76 2019-02-08 stsp if (blen == 0) {
1196 6353ad76 2019-02-08 stsp if (flen != 0)
1197 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1199 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1200 6353ad76 2019-02-08 stsp if (blen != 0)
1201 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1203 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1204 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1205 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1206 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1210 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1213 6353ad76 2019-02-08 stsp hdrlen = 0;
1216 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1217 7154f6ce 2019-03-27 stsp rewind(f);
1218 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1219 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1220 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1223 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1224 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1225 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1226 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1227 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1228 9d31a1d8 2018-03-11 stsp return err;
1232 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1233 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1235 e2b1e152 2019-07-13 stsp static const struct got_error *
1236 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1237 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1239 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1240 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1241 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1243 e2b1e152 2019-07-13 stsp return NULL;
1246 9d31a1d8 2018-03-11 stsp static const struct got_error *
1247 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1248 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1249 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1250 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1251 0584f854 2019-04-06 stsp void *progress_arg)
1253 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1254 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1255 6353ad76 2019-02-08 stsp char *ondisk_path;
1256 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1257 b8f41171 2019-02-10 stsp struct stat sb;
1259 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1260 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1263 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1264 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1265 a76c42e6 2019-08-03 stsp goto done;
1267 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1270 abb4604f 2019-07-27 stsp goto done;
1271 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1272 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1274 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1276 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1277 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1278 b8f41171 2019-02-10 stsp goto done;
1281 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1282 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1283 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1284 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1285 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1286 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1288 e2b1e152 2019-07-13 stsp goto done;
1289 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1291 6353ad76 2019-02-08 stsp goto done;
1293 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1294 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1295 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1296 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1297 b8f41171 2019-02-10 stsp goto done;
1301 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1303 6353ad76 2019-02-08 stsp goto done;
1305 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1306 234035bc 2019-06-01 stsp int update_timestamps;
1307 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1308 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1309 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1310 234035bc 2019-06-01 stsp struct got_object_id id2;
1311 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1312 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1314 f69721c3 2019-10-21 stsp goto done;
1316 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1317 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1318 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1319 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1320 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1321 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1322 f69721c3 2019-10-21 stsp goto done;
1324 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1325 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1326 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1327 234035bc 2019-06-01 stsp goto done;
1330 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1331 f69721c3 2019-10-21 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1332 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1333 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1334 f69721c3 2019-10-21 stsp free(label_orig);
1335 234035bc 2019-06-01 stsp if (blob2)
1336 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1338 909d120e 2019-09-22 stsp goto done;
1340 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1341 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1342 234035bc 2019-06-01 stsp * unmodified files again.
1344 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1345 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1346 234035bc 2019-06-01 stsp update_timestamps);
1347 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1348 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1349 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1350 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1351 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1353 1ee397ad 2019-07-12 stsp goto done;
1354 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1355 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1357 13d9040b 2019-03-27 stsp goto done;
1359 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1360 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1361 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1363 13d9040b 2019-03-27 stsp goto done;
1364 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1365 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1367 13d9040b 2019-03-27 stsp goto done;
1369 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1371 6353ad76 2019-02-08 stsp free(ondisk_path);
1372 8da9e5f4 2019-01-12 stsp return err;
1375 90285c3b 2019-01-08 stsp static const struct got_error *
1376 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1378 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1379 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1381 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1382 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1384 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1385 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1386 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1388 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1389 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1390 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1391 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1392 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1396 90285c3b 2019-01-08 stsp parent = dirname(parent);
1399 90285c3b 2019-01-08 stsp free(ondisk_path);
1400 90285c3b 2019-01-08 stsp return err;
1403 708d8e67 2019-03-27 stsp static const struct got_error *
1404 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1405 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1406 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1408 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1409 708d8e67 2019-03-27 stsp unsigned char status;
1410 708d8e67 2019-03-27 stsp struct stat sb;
1411 708d8e67 2019-03-27 stsp char *ondisk_path;
1413 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1414 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1416 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1418 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1420 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
1422 708d8e67 2019-03-27 stsp return err;
1424 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1425 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1426 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1428 1ee397ad 2019-07-12 stsp return err;
1430 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1431 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1433 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1436 708d8e67 2019-03-27 stsp return err;
1438 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1440 1ee397ad 2019-07-12 stsp return err;
1441 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1442 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1444 fc6346c4 2019-03-27 stsp return err;
1446 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1449 fc6346c4 2019-03-27 stsp return err;
1452 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1453 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1454 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1455 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1456 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1457 8da9e5f4 2019-01-12 stsp void *progress_arg;
1458 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1459 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1462 512f0d0e 2019-01-02 stsp static const struct got_error *
1463 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1464 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1466 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1468 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1469 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1471 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1472 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1475 8da9e5f4 2019-01-12 stsp static const struct got_error *
1476 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1478 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1480 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1481 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1483 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1484 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1487 9d31a1d8 2018-03-11 stsp static const struct got_error *
1488 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1490 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1491 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1492 8da9e5f4 2019-01-12 stsp char *path;
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 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1498 63c5ca5d 2019-08-24 stsp return NULL;
1500 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1501 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1503 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1505 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1506 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1508 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1509 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1511 8da9e5f4 2019-01-12 stsp free(path);
1512 0cd1c46a 2019-03-11 stsp return err;
1515 818c7501 2019-07-11 stsp static const struct got_error *
1516 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1518 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1519 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1520 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1522 517bab73 2019-03-11 stsp *refname = NULL;
1524 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1525 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1526 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1528 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1530 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1531 0647c563 2019-03-11 stsp *refname = NULL;
1533 517bab73 2019-03-11 stsp free(uuidstr);
1534 517bab73 2019-03-11 stsp return err;
1537 818c7501 2019-07-11 stsp const struct got_error *
1538 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1540 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1543 818c7501 2019-07-11 stsp static const struct got_error *
1544 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1546 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1547 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1550 818c7501 2019-07-11 stsp static const struct got_error *
1551 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1553 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1556 818c7501 2019-07-11 stsp static const struct got_error *
1557 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1559 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1560 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1563 818c7501 2019-07-11 stsp static const struct got_error *
1564 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1566 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1567 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1570 0ebf8283 2019-07-24 stsp static const struct got_error *
1571 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1573 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1574 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1577 0ebf8283 2019-07-24 stsp static const struct got_error *
1578 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1580 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1581 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1584 0ebf8283 2019-07-24 stsp static const struct got_error *
1585 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1587 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1588 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1591 0ebf8283 2019-07-24 stsp static const struct got_error *
1592 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1594 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1595 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1598 0ebf8283 2019-07-24 stsp const struct got_error *
1599 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1600 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1602 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1603 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1604 0ebf8283 2019-07-24 stsp *path = NULL;
1605 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1607 0ebf8283 2019-07-24 stsp return NULL;
1611 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1612 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1614 517bab73 2019-03-11 stsp static const struct got_error *
1615 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1617 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1618 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1619 517bab73 2019-03-11 stsp char *refname;
1621 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1623 517bab73 2019-03-11 stsp return err;
1625 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1627 0cd1c46a 2019-03-11 stsp goto done;
1629 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1631 0cd1c46a 2019-03-11 stsp free(refname);
1633 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1634 3e3a69f1 2019-07-25 stsp return err;
1637 3e3a69f1 2019-07-25 stsp static const struct got_error *
1638 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1640 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1642 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1643 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1644 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1645 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1647 9d31a1d8 2018-03-11 stsp return err;
1651 ebf99748 2019-05-09 stsp static const struct got_error *
1652 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1653 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
1655 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1656 ebf99748 2019-05-09 stsp FILE *index = NULL;
1658 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1659 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1660 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1661 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1663 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1665 ebf99748 2019-05-09 stsp goto done;
1667 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1668 ebf99748 2019-05-09 stsp if (index == NULL) {
1669 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1670 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1672 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1673 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1674 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1677 ebf99748 2019-05-09 stsp if (err) {
1678 ebf99748 2019-05-09 stsp free(*fileindex_path);
1679 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1680 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1681 ebf99748 2019-05-09 stsp *fileindex = NULL;
1683 ebf99748 2019-05-09 stsp return err;
1686 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1687 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1688 c932eeeb 2019-05-22 stsp const char *path;
1689 c932eeeb 2019-05-22 stsp size_t path_len;
1690 c932eeeb 2019-05-22 stsp const char *entry_name;
1691 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1692 a484d721 2019-06-10 stsp void *progress_arg;
1695 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1696 c932eeeb 2019-05-22 stsp static const struct got_error *
1697 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1699 1ee397ad 2019-07-12 stsp const struct got_error *err;
1700 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1702 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1703 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1704 c932eeeb 2019-05-22 stsp return NULL;
1705 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1706 102ff934 2019-06-11 stsp return NULL;
1708 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1709 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1710 c932eeeb 2019-05-22 stsp return NULL;
1712 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1713 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1714 edd02c5e 2019-07-11 stsp ie->path);
1716 1ee397ad 2019-07-12 stsp return err;
1718 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1719 c932eeeb 2019-05-22 stsp return NULL;
1722 9c6338c4 2019-06-02 stsp static const struct got_error *
1723 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1725 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1726 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1727 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1729 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1730 9c6338c4 2019-06-02 stsp fileindex_path);
1732 9c6338c4 2019-06-02 stsp goto done;
1734 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1736 9c6338c4 2019-06-02 stsp goto done;
1738 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1739 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1740 9c6338c4 2019-06-02 stsp fileindex_path);
1741 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1744 9c6338c4 2019-06-02 stsp if (new_index)
1745 9c6338c4 2019-06-02 stsp fclose(new_index);
1746 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1747 9c6338c4 2019-06-02 stsp return err;
1750 6ced4176 2019-07-12 stsp static const struct got_error *
1751 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1752 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1753 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1755 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1756 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1757 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1758 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1760 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1761 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1762 6ced4176 2019-07-12 stsp *tree_id = NULL;
1764 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1765 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1766 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1767 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1768 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1769 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1770 6ced4176 2019-07-12 stsp goto done;
1772 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1773 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1775 6ced4176 2019-07-12 stsp goto done;
1776 6ced4176 2019-07-12 stsp return NULL;
1779 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1781 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1782 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1783 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1784 6ced4176 2019-07-12 stsp goto done;
1787 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1788 6ced4176 2019-07-12 stsp in_repo_path);
1790 6ced4176 2019-07-12 stsp goto done;
1792 6ced4176 2019-07-12 stsp free(in_repo_path);
1793 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1795 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1797 6ced4176 2019-07-12 stsp goto done;
1799 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1800 6ced4176 2019-07-12 stsp /* Check out a single file. */
1801 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1802 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1803 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1804 6ced4176 2019-07-12 stsp if (in_repo_path == 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 *tree_relpath = strdup("");
1809 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1810 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1811 6ced4176 2019-07-12 stsp goto done;
1814 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1815 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1817 6ced4176 2019-07-12 stsp return err;
1818 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1819 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1820 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1821 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1822 6ced4176 2019-07-12 stsp goto done;
1825 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1826 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1828 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1829 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1830 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1831 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1832 6ced4176 2019-07-12 stsp goto done;
1834 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1835 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1836 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1837 6ced4176 2019-07-12 stsp goto done;
1842 6ced4176 2019-07-12 stsp free(in_repo_path);
1843 6ced4176 2019-07-12 stsp if (err) {
1844 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1845 6ced4176 2019-07-12 stsp free(*tree_relpath);
1846 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1847 6ced4176 2019-07-12 stsp free(*tree_id);
1848 6ced4176 2019-07-12 stsp *tree_id = NULL;
1850 07ed472d 2019-07-12 stsp return err;
1853 07ed472d 2019-07-12 stsp static const struct got_error *
1854 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1855 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1856 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1857 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1859 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1860 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1861 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1862 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1863 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1865 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1867 07ed472d 2019-07-12 stsp goto done;
1869 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1870 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1872 07ed472d 2019-07-12 stsp goto done;
1874 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1876 07ed472d 2019-07-12 stsp goto done;
1878 07ed472d 2019-07-12 stsp if (entry_name &&
1879 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1880 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1881 07ed472d 2019-07-12 stsp goto done;
1884 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1885 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1886 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1887 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1888 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1889 07ed472d 2019-07-12 stsp arg.repo = repo;
1890 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1891 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1892 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1893 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1894 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1895 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1898 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1899 07ed472d 2019-07-12 stsp if (commit)
1900 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1901 6ced4176 2019-07-12 stsp return err;
1904 9d31a1d8 2018-03-11 stsp const struct got_error *
1905 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1906 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1907 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1908 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
1910 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1911 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1912 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1913 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1914 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1915 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1916 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1917 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1918 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1919 f2ea84fa 2019-07-27 stsp int entry_type;
1920 f2ea84fa 2019-07-27 stsp char *relpath;
1921 f2ea84fa 2019-07-27 stsp char *entry_name;
1922 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1923 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1925 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1927 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1929 9d31a1d8 2018-03-11 stsp return err;
1931 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1932 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1933 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1934 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1935 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1936 f2ea84fa 2019-07-27 stsp goto done;
1939 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1940 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1941 f2ea84fa 2019-07-27 stsp if (err) {
1942 f2ea84fa 2019-07-27 stsp free(tpd);
1943 6ced4176 2019-07-12 stsp goto done;
1946 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1947 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1948 f2ea84fa 2019-07-27 stsp if (err) {
1949 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1950 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1951 f2ea84fa 2019-07-27 stsp free(tpd);
1952 f2ea84fa 2019-07-27 stsp goto done;
1955 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1957 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1961 51514078 2018-12-25 stsp * Read the file index.
1962 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1963 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1965 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1967 c4cdcb68 2019-04-03 stsp goto done;
1969 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1970 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1971 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1973 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
1974 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
1975 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
1979 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1980 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
1981 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
1982 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
1983 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1984 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1985 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1986 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1990 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
1992 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1993 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1994 af12c6b9 2019-06-04 stsp err = sync_err;
1996 9c6338c4 2019-06-02 stsp free(fileindex_path);
1998 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1999 9d31a1d8 2018-03-11 stsp if (commit)
2000 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2001 5ade8233 2019-07-12 stsp if (fileindex)
2002 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2003 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2004 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2005 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2006 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2007 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2008 f2ea84fa 2019-07-27 stsp free(tpd);
2010 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2011 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2012 9d31a1d8 2018-03-11 stsp err = unlockerr;
2013 f8d1f275 2019-02-04 stsp return err;
2016 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2017 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2018 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2019 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2020 234035bc 2019-06-01 stsp void *progress_arg;
2021 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2022 234035bc 2019-06-01 stsp void *cancel_arg;
2023 f69721c3 2019-10-21 stsp const char *label_orig;
2024 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2027 234035bc 2019-06-01 stsp static const struct got_error *
2028 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2029 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2030 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2031 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2033 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2034 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2035 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2036 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2037 234035bc 2019-06-01 stsp struct stat sb;
2038 234035bc 2019-06-01 stsp unsigned char status;
2039 234035bc 2019-06-01 stsp int local_changes_subsumed;
2041 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2042 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2043 d6c87207 2019-08-02 stsp strlen(path2));
2044 1ee397ad 2019-07-12 stsp if (ie == NULL)
2045 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2046 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2048 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2049 234035bc 2019-06-01 stsp path2) == -1)
2050 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2052 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2055 234035bc 2019-06-01 stsp goto done;
2057 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2058 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2059 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2060 234035bc 2019-06-01 stsp goto done;
2062 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2063 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2064 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2065 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2066 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2067 234035bc 2019-06-01 stsp goto done;
2070 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2071 f69721c3 2019-10-21 stsp ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2072 f69721c3 2019-10-21 stsp a->commit_id2, repo, a->progress_cb, a->progress_arg);
2073 234035bc 2019-06-01 stsp } else if (blob1) {
2074 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2075 d6c87207 2019-08-02 stsp strlen(path1));
2076 1ee397ad 2019-07-12 stsp if (ie == NULL)
2077 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2078 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2080 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2081 2b92fad7 2019-06-02 stsp path1) == -1)
2082 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2084 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2087 2b92fad7 2019-06-02 stsp goto done;
2089 2b92fad7 2019-06-02 stsp switch (status) {
2090 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2091 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2092 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2094 1ee397ad 2019-07-12 stsp goto done;
2095 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2097 2b92fad7 2019-06-02 stsp goto done;
2099 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2101 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2102 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2103 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2104 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2106 1ee397ad 2019-07-12 stsp goto done;
2108 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2110 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2111 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2112 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2113 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2114 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2116 1ee397ad 2019-07-12 stsp goto done;
2118 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2119 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2121 1ee397ad 2019-07-12 stsp goto done;
2126 234035bc 2019-06-01 stsp } else if (blob2) {
2127 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2128 234035bc 2019-06-01 stsp path2) == -1)
2129 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2130 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2131 d6c87207 2019-08-02 stsp strlen(path2));
2133 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2134 7f91a133 2019-12-13 stsp -1, NULL, repo);
2136 234035bc 2019-06-01 stsp goto done;
2137 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2138 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2139 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2140 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2141 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2142 1ee397ad 2019-07-12 stsp status, path2);
2143 234035bc 2019-06-01 stsp goto done;
2145 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2146 f69721c3 2019-10-21 stsp NULL, ondisk_path, path2, sb.st_mode,
2147 f69721c3 2019-10-21 stsp a->label_orig, blob2, a->commit_id2, repo,
2148 f69721c3 2019-10-21 stsp a->progress_cb,
2149 f69721c3 2019-10-21 stsp a->progress_arg);
2150 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2151 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2152 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2153 234035bc 2019-06-01 stsp blob2, 0);
2155 234035bc 2019-06-01 stsp goto done;
2158 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2159 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2160 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2161 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2162 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2163 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2165 234035bc 2019-06-01 stsp goto done;
2166 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2167 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2169 234035bc 2019-06-01 stsp goto done;
2170 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2171 2b92fad7 2019-06-02 stsp if (err) {
2172 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2173 2b92fad7 2019-06-02 stsp goto done;
2178 234035bc 2019-06-01 stsp free(ondisk_path);
2179 234035bc 2019-06-01 stsp return err;
2182 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2183 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2184 234035bc 2019-06-01 stsp struct got_repository *repo;
2187 234035bc 2019-06-01 stsp static const struct got_error *
2188 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2190 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2191 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2192 234035bc 2019-06-01 stsp unsigned char status;
2193 234035bc 2019-06-01 stsp struct stat sb;
2194 234035bc 2019-06-01 stsp char *ondisk_path;
2196 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2197 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2198 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2199 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2201 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2203 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2205 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2206 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2208 234035bc 2019-06-01 stsp return err;
2209 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2210 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2212 234035bc 2019-06-01 stsp return NULL;
2215 818c7501 2019-07-11 stsp static const struct got_error *
2216 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2217 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2218 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2219 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2220 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2222 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2223 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2224 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2225 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2226 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2228 03415a1a 2019-06-02 stsp if (commit_id1) {
2229 f69721c3 2019-10-21 stsp char *id_str;
2231 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2232 03415a1a 2019-06-02 stsp worktree->path_prefix);
2234 03415a1a 2019-06-02 stsp goto done;
2236 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2238 03415a1a 2019-06-02 stsp goto done;
2240 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2242 f69721c3 2019-10-21 stsp goto done;
2244 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2245 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2246 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2247 f69721c3 2019-10-21 stsp free(id_str);
2248 f69721c3 2019-10-21 stsp goto done;
2250 f69721c3 2019-10-21 stsp free(id_str);
2253 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2254 234035bc 2019-06-01 stsp worktree->path_prefix);
2256 234035bc 2019-06-01 stsp goto done;
2258 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2260 234035bc 2019-06-01 stsp goto done;
2262 234035bc 2019-06-01 stsp arg.worktree = worktree;
2263 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2264 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2265 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2266 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2267 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2268 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2269 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2270 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2271 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2272 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2273 af12c6b9 2019-06-04 stsp err = sync_err;
2275 234035bc 2019-06-01 stsp if (tree1)
2276 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2277 234035bc 2019-06-01 stsp if (tree2)
2278 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2279 f69721c3 2019-10-21 stsp free(label_orig);
2280 818c7501 2019-07-11 stsp return err;
2283 818c7501 2019-07-11 stsp const struct got_error *
2284 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2285 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2286 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2287 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2289 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2290 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2291 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2292 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2294 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2296 818c7501 2019-07-11 stsp return err;
2298 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2300 818c7501 2019-07-11 stsp goto done;
2302 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2303 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2304 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2305 818c7501 2019-07-11 stsp &mok_arg);
2307 818c7501 2019-07-11 stsp goto done;
2309 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2310 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2312 818c7501 2019-07-11 stsp if (fileindex)
2313 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2314 818c7501 2019-07-11 stsp free(fileindex_path);
2315 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2316 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2317 234035bc 2019-06-01 stsp err = unlockerr;
2318 234035bc 2019-06-01 stsp return err;
2321 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2322 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2323 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2324 927df6b7 2019-02-10 stsp const char *status_path;
2325 927df6b7 2019-02-10 stsp size_t status_path_len;
2326 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2327 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2328 f8d1f275 2019-02-04 stsp void *status_arg;
2329 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2330 f8d1f275 2019-02-04 stsp void *cancel_arg;
2331 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2332 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2333 f2a9dc41 2019-12-13 tracey int report_unchanged;
2336 f8d1f275 2019-02-04 stsp static const struct got_error *
2337 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2338 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
2339 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2340 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
2342 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2343 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2344 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2345 927df6b7 2019-02-10 stsp struct stat sb;
2346 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2347 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2348 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2350 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2352 98eaaa12 2019-08-03 stsp return err;
2354 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2355 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2356 98eaaa12 2019-08-03 stsp return NULL;
2358 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2359 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2360 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2362 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2363 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2364 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2366 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2367 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2368 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2369 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2370 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2373 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2374 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2377 927df6b7 2019-02-10 stsp static const struct got_error *
2378 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2379 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
2381 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2382 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2383 f8d1f275 2019-02-04 stsp char *abspath;
2385 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2386 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2388 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2389 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2390 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2391 927df6b7 2019-02-10 stsp return NULL;
2393 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2394 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2395 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2396 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2398 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2399 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2400 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2403 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
2404 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2405 f8d1f275 2019-02-04 stsp free(abspath);
2406 9d31a1d8 2018-03-11 stsp return err;
2409 f8d1f275 2019-02-04 stsp static const struct got_error *
2410 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2412 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2413 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2414 2ec1f75b 2019-03-26 stsp unsigned char status;
2416 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2417 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2419 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2420 927df6b7 2019-02-10 stsp return NULL;
2422 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2423 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2424 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2425 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2427 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2428 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2429 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2433 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2435 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2437 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2438 6841da00 2019-08-08 stsp free((char *)pe->path);
2439 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2443 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2445 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2447 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2448 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2449 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2450 6841da00 2019-08-08 stsp free((char *)pe->path);
2452 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2455 6841da00 2019-08-08 stsp static const struct got_error *
2456 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2458 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2459 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2460 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2461 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2462 6841da00 2019-08-08 stsp size_t linesize = 0;
2463 6841da00 2019-08-08 stsp ssize_t linelen;
2465 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2466 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2467 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2468 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2470 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2471 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2472 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2474 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
2475 bd8de430 2019-10-04 stsp if (line[0] == '#')
2478 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
2479 bd8de430 2019-10-04 stsp if (line[0] == '!')
2482 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2483 6841da00 2019-08-08 stsp line) == -1) {
2484 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2485 6841da00 2019-08-08 stsp goto done;
2487 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2489 6841da00 2019-08-08 stsp goto done;
2491 6841da00 2019-08-08 stsp if (ferror(f)) {
2492 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2493 6841da00 2019-08-08 stsp goto done;
2496 6841da00 2019-08-08 stsp dirpath = strdup(path);
2497 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2498 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2499 6841da00 2019-08-08 stsp goto done;
2501 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2503 6841da00 2019-08-08 stsp free(line);
2504 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2505 6841da00 2019-08-08 stsp free(dirpath);
2506 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2508 6841da00 2019-08-08 stsp return err;
2512 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2514 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2516 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
2517 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
2518 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
2519 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
2521 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2522 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
2524 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
2526 bd8de430 2019-10-04 stsp pattern += 3;
2528 bd8de430 2019-10-04 stsp while (*p) {
2529 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
2530 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
2531 bd8de430 2019-10-04 stsp /* Retry in next directory. */
2532 bd8de430 2019-10-04 stsp while (*p && *p != '/')
2534 bd8de430 2019-10-04 stsp while (*p == '/')
2544 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2545 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2546 6841da00 2019-08-08 stsp * ignores backwards.
2548 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2549 6841da00 2019-08-08 stsp while (pe) {
2550 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2551 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2552 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2553 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2554 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
2555 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
2556 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
2557 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
2558 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
2563 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2569 6841da00 2019-08-08 stsp static const struct got_error *
2570 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2571 bd8de430 2019-10-04 stsp const char *path, const char *ignores_filename)
2573 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2574 6841da00 2019-08-08 stsp char *ignorespath;
2575 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2577 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2578 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
2579 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2581 6841da00 2019-08-08 stsp ignoresfile = fopen(ignorespath, "r");
2582 6841da00 2019-08-08 stsp if (ignoresfile == NULL) {
2583 40b289d7 2019-09-07 stsp if (errno != ENOENT && errno != EACCES)
2584 6841da00 2019-08-08 stsp err = got_error_from_errno2("fopen",
2585 6841da00 2019-08-08 stsp ignorespath);
2587 6841da00 2019-08-08 stsp err = read_ignores(ignores, path, ignoresfile);
2589 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2590 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
2591 6841da00 2019-08-08 stsp free(ignorespath);
2592 6841da00 2019-08-08 stsp return err;
2595 f8d1f275 2019-02-04 stsp static const struct got_error *
2596 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
2598 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2599 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2600 f8d1f275 2019-02-04 stsp char *path = NULL;
2602 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2603 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2605 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2606 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2607 927df6b7 2019-02-10 stsp return NULL;
2609 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2610 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2611 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2613 f8d1f275 2019-02-04 stsp path = de->d_name;
2616 bd8de430 2019-10-04 stsp if (de->d_type == DT_DIR) {
2617 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
2618 bd8de430 2019-10-04 stsp ".cvsignore");
2619 bd8de430 2019-10-04 stsp if (err == NULL)
2620 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
2621 bd8de430 2019-10-04 stsp path, ".gitignore");
2623 6841da00 2019-08-08 stsp else if (got_path_is_child(path, a->status_path, a->status_path_len)
2624 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2625 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2626 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2627 f8d1f275 2019-02-04 stsp if (parent_path[0])
2628 f8d1f275 2019-02-04 stsp free(path);
2629 b72f483a 2019-02-05 stsp return err;
2632 347d1d3e 2019-07-12 stsp static const struct got_error *
2633 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2634 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2635 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
2637 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2638 abb4604f 2019-07-27 stsp struct stat sb;
2640 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2642 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
2643 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
2645 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2646 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2647 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2648 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2649 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2650 abb4604f 2019-07-27 stsp return NULL;
2653 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2654 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2655 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2657 abb4604f 2019-07-27 stsp return NULL;
2660 abb4604f 2019-07-27 stsp static const struct got_error *
2661 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2662 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2663 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2664 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2665 f2a9dc41 2019-12-13 tracey int report_unchanged)
2667 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2668 6fc93f37 2019-12-13 stsp int fd = -1;
2669 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2670 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2671 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2673 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2674 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2675 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2677 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2678 6fc93f37 2019-12-13 stsp if (fd == -1) {
2679 40b289d7 2019-09-07 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2680 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
2682 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2683 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
2684 f2a9dc41 2019-12-13 tracey report_unchanged);
2686 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2687 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2688 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2689 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2690 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2691 abb4604f 2019-07-27 stsp arg.status_path = path;
2692 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2693 abb4604f 2019-07-27 stsp arg.repo = repo;
2694 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2695 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2696 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2697 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2698 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
2699 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2700 022fae89 2019-12-06 tracey if (!no_ignores) {
2701 bd8de430 2019-10-04 stsp err = add_ignores(&arg.ignores, worktree->root_path,
2702 022fae89 2019-12-06 tracey path, ".cvsignore");
2703 022fae89 2019-12-06 tracey if (err == NULL)
2704 022fae89 2019-12-06 tracey err = add_ignores(&arg.ignores,
2705 022fae89 2019-12-06 tracey worktree->root_path, path, ".gitignore");
2707 bd8de430 2019-10-04 stsp if (err == NULL)
2708 6fc93f37 2019-12-13 stsp err = got_fileindex_diff_dir(fileindex, fd,
2709 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2710 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2713 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
2714 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
2715 927df6b7 2019-02-10 stsp free(ondisk_path);
2716 347d1d3e 2019-07-12 stsp return err;
2719 347d1d3e 2019-07-12 stsp const struct got_error *
2720 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2721 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2722 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2723 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2725 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2726 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2727 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2728 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2730 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2732 347d1d3e 2019-07-12 stsp return err;
2734 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2735 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2736 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
2740 f8d1f275 2019-02-04 stsp free(fileindex_path);
2741 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2742 f8d1f275 2019-02-04 stsp return err;
2745 6c7ab921 2019-03-18 stsp const struct got_error *
2746 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2747 6c7ab921 2019-03-18 stsp const char *arg)
2749 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2750 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2751 6c7ab921 2019-03-18 stsp size_t len;
2753 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2755 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2756 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2757 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2758 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2759 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2760 d0710d08 2019-07-22 stsp if (cwd == NULL)
2761 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2762 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2763 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2764 d0710d08 2019-07-22 stsp goto done;
2768 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2769 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2770 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2771 6c7ab921 2019-03-18 stsp goto done;
2774 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2775 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2776 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2778 f6d88e1a 2019-05-29 stsp goto done;
2780 f6d88e1a 2019-05-29 stsp path = strdup("");
2781 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2782 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2783 f6d88e1a 2019-05-29 stsp goto done;
2787 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2788 6c7ab921 2019-03-18 stsp len = strlen(path);
2789 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2790 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2794 6c7ab921 2019-03-18 stsp free(resolved);
2795 d0710d08 2019-07-22 stsp free(cwd);
2796 6c7ab921 2019-03-18 stsp if (err == NULL)
2797 6c7ab921 2019-03-18 stsp *wt_path = path;
2799 6c7ab921 2019-03-18 stsp free(path);
2800 d00136be 2019-03-26 stsp return err;
2803 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
2804 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
2805 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
2806 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
2807 4e68cba3 2019-11-23 stsp void *progress_arg;
2808 4e68cba3 2019-11-23 stsp struct got_repository *repo;
2811 4e68cba3 2019-11-23 stsp static const struct got_error *
2812 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
2813 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
2814 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2815 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2817 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
2818 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2819 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2820 6d022e97 2019-08-04 stsp struct stat sb;
2821 dbb83fbd 2019-12-12 stsp char *ondisk_path;
2823 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2824 dbb83fbd 2019-12-12 stsp relpath) == -1)
2825 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
2827 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2829 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
2830 12463d8b 2019-12-13 stsp de_name, a->repo);
2832 dbb83fbd 2019-12-12 stsp goto done;
2833 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2834 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2835 dbb83fbd 2019-12-12 stsp goto done;
2836 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2838 dbb83fbd 2019-12-12 stsp goto done;
2841 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
2842 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
2843 dbb83fbd 2019-12-12 stsp goto done;
2846 dbb83fbd 2019-12-12 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2848 4e68cba3 2019-11-23 stsp goto done;
2850 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2851 07f5b47a 2019-06-02 stsp if (err) {
2852 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2853 4e68cba3 2019-11-23 stsp goto done;
2856 dbb83fbd 2019-12-12 stsp free(ondisk_path);
2858 dbb83fbd 2019-12-12 stsp return err;
2859 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
2860 dbb83fbd 2019-12-12 stsp return NULL;
2861 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
2864 d00136be 2019-03-26 stsp const struct got_error *
2865 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2866 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2867 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2868 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
2870 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2871 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2872 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2873 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2874 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
2876 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2878 d00136be 2019-03-26 stsp return err;
2880 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2882 d00136be 2019-03-26 stsp goto done;
2884 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
2885 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
2886 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
2887 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
2888 4e68cba3 2019-11-23 stsp saa.repo = repo;
2890 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2891 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2892 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
2896 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2897 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2898 af12c6b9 2019-06-04 stsp err = sync_err;
2900 fb399478 2019-07-12 stsp free(fileindex_path);
2901 d00136be 2019-03-26 stsp if (fileindex)
2902 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2903 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2904 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2905 d00136be 2019-03-26 stsp err = unlockerr;
2906 6c7ab921 2019-03-18 stsp return err;
2909 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
2910 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
2911 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
2912 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
2913 f2a9dc41 2019-12-13 tracey void *progress_arg;
2914 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
2915 f2a9dc41 2019-12-13 tracey int delete_local_mods;
2918 f2a9dc41 2019-12-13 tracey static const struct got_error *
2919 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
2920 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
2921 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2922 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
2924 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
2925 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2926 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2927 17ed4618 2019-06-02 stsp struct stat sb;
2928 f2a9dc41 2019-12-13 tracey char *ondisk_path;
2930 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2931 17ed4618 2019-06-02 stsp if (ie == NULL)
2932 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2934 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
2935 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
2936 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2937 9acbc4fa 2019-08-03 stsp return NULL;
2938 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2941 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2942 f2a9dc41 2019-12-13 tracey relpath) == -1)
2943 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
2945 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
2948 f2a9dc41 2019-12-13 tracey goto done;
2950 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2951 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2952 f2a9dc41 2019-12-13 tracey goto done;
2953 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
2954 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2955 f2a9dc41 2019-12-13 tracey goto done;
2957 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
2958 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
2959 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2960 f2a9dc41 2019-12-13 tracey goto done;
2964 12463d8b 2019-12-13 stsp if (status != GOT_STATUS_MISSING) {
2965 12463d8b 2019-12-13 stsp if (dirfd != -1) {
2966 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
2967 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
2968 12463d8b 2019-12-13 stsp ondisk_path);
2969 12463d8b 2019-12-13 stsp goto done;
2971 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
2972 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2973 12463d8b 2019-12-13 stsp goto done;
2977 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2979 f2a9dc41 2019-12-13 tracey free(ondisk_path);
2980 f2a9dc41 2019-12-13 tracey if (err)
2981 f2a9dc41 2019-12-13 tracey return err;
2982 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
2983 f2a9dc41 2019-12-13 tracey return NULL;
2984 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
2985 f2a9dc41 2019-12-13 tracey staged_status, relpath);
2988 2ec1f75b 2019-03-26 stsp const struct got_error *
2989 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2990 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
2991 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
2992 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2994 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2995 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2996 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2997 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2998 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3000 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3002 2ec1f75b 2019-03-26 stsp return err;
3004 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3006 2ec1f75b 2019-03-26 stsp goto done;
3008 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3009 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3010 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3011 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3012 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3013 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3015 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3016 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3017 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3021 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3022 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3023 af12c6b9 2019-06-04 stsp err = sync_err;
3025 fb399478 2019-07-12 stsp free(fileindex_path);
3026 2ec1f75b 2019-03-26 stsp if (fileindex)
3027 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3028 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3029 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3030 2ec1f75b 2019-03-26 stsp err = unlockerr;
3031 33aa809d 2019-08-08 stsp return err;
3034 33aa809d 2019-08-08 stsp static const struct got_error *
3035 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3037 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3038 33aa809d 2019-08-08 stsp char *line = NULL;
3039 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3040 33aa809d 2019-08-08 stsp ssize_t linelen;
3042 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3043 33aa809d 2019-08-08 stsp if (linelen == -1) {
3044 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3045 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3046 33aa809d 2019-08-08 stsp goto done;
3048 33aa809d 2019-08-08 stsp return NULL;
3050 33aa809d 2019-08-08 stsp if (outfile) {
3051 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3052 33aa809d 2019-08-08 stsp if (n != linelen) {
3053 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3054 33aa809d 2019-08-08 stsp goto done;
3057 33aa809d 2019-08-08 stsp if (rejectfile) {
3058 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3059 33aa809d 2019-08-08 stsp if (n != linelen)
3060 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3063 33aa809d 2019-08-08 stsp free(line);
3064 2ec1f75b 2019-03-26 stsp return err;
3067 33aa809d 2019-08-08 stsp static const struct got_error *
3068 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3070 33aa809d 2019-08-08 stsp char *line = NULL;
3071 33aa809d 2019-08-08 stsp size_t linesize = 0;
3072 33aa809d 2019-08-08 stsp ssize_t linelen;
3074 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3075 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3076 500467ff 2019-09-25 hiltjo if (ferror(f))
3077 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3078 500467ff 2019-09-25 hiltjo return NULL;
3080 33aa809d 2019-08-08 stsp free(line);
3081 33aa809d 2019-08-08 stsp return NULL;
3084 33aa809d 2019-08-08 stsp static const struct got_error *
3085 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3086 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3087 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3089 33aa809d 2019-08-08 stsp const struct got_error *err;
3091 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3092 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3093 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3095 33aa809d 2019-08-08 stsp return err;
3096 33aa809d 2019-08-08 stsp (*line_cur1)++;
3098 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3099 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3100 33aa809d 2019-08-08 stsp if (rejectfile)
3101 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3103 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3105 33aa809d 2019-08-08 stsp return err;
3106 33aa809d 2019-08-08 stsp (*line_cur2)++;
3108 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3109 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3110 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3112 33aa809d 2019-08-08 stsp return err;
3113 33aa809d 2019-08-08 stsp (*line_cur2)++;
3115 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3116 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3117 33aa809d 2019-08-08 stsp if (rejectfile)
3118 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3120 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3122 33aa809d 2019-08-08 stsp return err;
3123 33aa809d 2019-08-08 stsp (*line_cur1)++;
3126 f1e81a05 2019-08-10 stsp return NULL;
3129 f1e81a05 2019-08-10 stsp static const struct got_error *
3130 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3131 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3133 f1e81a05 2019-08-10 stsp const struct got_error *err;
3135 f1e81a05 2019-08-10 stsp if (outfile) {
3136 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3137 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3138 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3140 f1e81a05 2019-08-10 stsp return err;
3141 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3144 f1e81a05 2019-08-10 stsp if (rejectfile) {
3145 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3146 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3147 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3149 f1e81a05 2019-08-10 stsp return err;
3150 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3154 33aa809d 2019-08-08 stsp return NULL;
3157 33aa809d 2019-08-08 stsp static const struct got_error *
3158 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3159 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3160 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3161 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3162 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3164 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3165 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3166 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3167 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3168 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
3169 33aa809d 2019-08-08 stsp long pos1, pos2;
3170 33aa809d 2019-08-08 stsp FILE *hunkfile;
3172 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3174 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
3175 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
3176 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
3178 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
3179 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
3181 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
3182 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3184 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
3185 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3186 33aa809d 2019-08-08 stsp goto done;
3188 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
3189 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3190 33aa809d 2019-08-08 stsp goto done;
3192 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3193 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
3194 33aa809d 2019-08-08 stsp goto done;
3197 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3198 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
3200 33aa809d 2019-08-08 stsp goto done;
3202 33aa809d 2019-08-08 stsp switch (*choice) {
3203 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
3204 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3205 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
3207 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3208 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3209 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3211 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3214 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3218 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3219 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3220 33aa809d 2019-08-08 stsp return err;
3223 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3224 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3225 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3226 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3227 1f1abb7e 2019-08-08 stsp void *progress_arg;
3228 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3229 33aa809d 2019-08-08 stsp void *patch_arg;
3230 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3233 e20a8b6f 2019-06-04 stsp static const struct got_error *
3234 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3235 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3236 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
3237 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3238 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3240 33aa809d 2019-08-08 stsp const struct got_error *err;
3241 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3242 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3243 1ebedb77 2019-10-19 stsp int fd2 = -1;
3244 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3245 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3246 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3247 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3248 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3249 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3250 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3251 33aa809d 2019-08-08 stsp int n = 0;
3253 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3255 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3257 33aa809d 2019-08-08 stsp return err;
3259 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
3260 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3261 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3262 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", path2);
3263 12463d8b 2019-12-13 stsp goto done;
3266 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3267 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3268 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", path2);
3269 12463d8b 2019-12-13 stsp goto done;
3272 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
3273 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
3274 1ebedb77 2019-10-19 stsp goto done;
3277 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
3278 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3279 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fopen", path2);
3280 33aa809d 2019-08-08 stsp goto done;
3284 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3286 33aa809d 2019-08-08 stsp goto done;
3288 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3290 33aa809d 2019-08-08 stsp goto done;
3292 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3294 33aa809d 2019-08-08 stsp goto done;
3296 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3297 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3298 33aa809d 2019-08-08 stsp goto done;
3301 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3302 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3304 33aa809d 2019-08-08 stsp goto done;
3306 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3308 33aa809d 2019-08-08 stsp goto done;
3310 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3311 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3312 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3313 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3314 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3315 33aa809d 2019-08-08 stsp int choice;
3316 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3317 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3318 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3319 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3320 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3321 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3323 33aa809d 2019-08-08 stsp goto done;
3324 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3325 33aa809d 2019-08-08 stsp have_content = 1;
3326 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3329 1ebedb77 2019-10-19 stsp if (have_content) {
3330 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3331 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3332 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3334 1ebedb77 2019-10-19 stsp goto done;
3336 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
3337 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
3338 1ebedb77 2019-10-19 stsp goto done;
3342 33aa809d 2019-08-08 stsp free(id_str);
3344 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3345 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3346 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3347 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3348 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3349 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3350 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
3351 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3352 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3353 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3354 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3355 33aa809d 2019-08-08 stsp if (err || !have_content) {
3356 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3357 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3358 33aa809d 2019-08-08 stsp free(*path_outfile);
3359 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3361 33aa809d 2019-08-08 stsp free(args);
3363 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3366 33aa809d 2019-08-08 stsp if (changes)
3367 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3368 33aa809d 2019-08-08 stsp free(path1);
3369 33aa809d 2019-08-08 stsp return err;
3372 33aa809d 2019-08-08 stsp static const struct got_error *
3373 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3374 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3375 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3376 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3378 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3379 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3380 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3381 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3382 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3383 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3384 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3385 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3386 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3387 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3389 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3390 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3391 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3392 d3bcc3d1 2019-08-08 stsp return NULL;
3394 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3395 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3396 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3398 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3399 65084dad 2019-08-08 stsp if (ie == NULL)
3400 65084dad 2019-08-08 stsp return got_error(GOT_ERR_BAD_PATH);
3402 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3403 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3404 a129376b 2019-03-28 stsp if (err) {
3405 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3406 a129376b 2019-03-28 stsp goto done;
3407 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3408 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3409 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3410 e20a8b6f 2019-06-04 stsp goto done;
3413 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3414 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3415 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3416 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3417 a129376b 2019-03-28 stsp goto done;
3420 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3421 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3422 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3423 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3424 a129376b 2019-03-28 stsp goto done;
3427 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3428 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3429 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3430 a129376b 2019-03-28 stsp goto done;
3435 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3436 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3437 a9fa2909 2019-07-27 stsp if (err) {
3438 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3439 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3440 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3441 a9fa2909 2019-07-27 stsp goto done;
3443 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3445 a9fa2909 2019-07-27 stsp goto done;
3447 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3448 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3449 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3450 a9fa2909 2019-07-27 stsp goto done;
3453 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3454 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3455 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3456 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3457 a9fa2909 2019-07-27 stsp goto done;
3461 a129376b 2019-03-28 stsp switch (status) {
3462 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3463 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3464 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3465 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3466 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3468 33aa809d 2019-08-08 stsp goto done;
3469 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3472 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3473 1f1abb7e 2019-08-08 stsp ie->path);
3475 1ee397ad 2019-07-12 stsp goto done;
3476 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3478 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3479 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3480 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3481 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3482 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3484 33aa809d 2019-08-08 stsp goto done;
3485 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3488 33aa809d 2019-08-08 stsp /* fall through */
3489 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3490 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
3491 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3492 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3493 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3494 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3495 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3496 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3497 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3499 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3500 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3501 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3503 65084dad 2019-08-08 stsp goto done;
3505 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3506 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3507 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3508 a129376b 2019-03-28 stsp goto done;
3511 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3512 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3513 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3514 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
3515 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3516 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3518 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3519 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3520 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3521 33aa809d 2019-08-08 stsp goto done;
3524 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3525 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3526 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3527 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3529 a129376b 2019-03-28 stsp goto done;
3530 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
3531 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
3532 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3533 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3536 33aa809d 2019-08-08 stsp goto done;
3545 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3546 33aa809d 2019-08-08 stsp free(path_content);
3547 e20a8b6f 2019-06-04 stsp free(parent_path);
3548 a129376b 2019-03-28 stsp free(tree_path);
3550 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3552 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3553 a129376b 2019-03-28 stsp free(tree_id);
3554 e20a8b6f 2019-06-04 stsp return err;
3557 e20a8b6f 2019-06-04 stsp const struct got_error *
3558 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3559 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3560 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3561 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3562 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3564 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3565 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3566 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3567 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3568 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3569 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3571 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3573 e20a8b6f 2019-06-04 stsp return err;
3575 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3577 e20a8b6f 2019-06-04 stsp goto done;
3579 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3580 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3581 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3582 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3583 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3584 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3585 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3586 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3587 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3588 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
3592 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3593 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3594 e20a8b6f 2019-06-04 stsp err = sync_err;
3596 fb399478 2019-07-12 stsp free(fileindex_path);
3597 a129376b 2019-03-28 stsp if (fileindex)
3598 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3599 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3600 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3601 a129376b 2019-03-28 stsp err = unlockerr;
3602 c4296144 2019-05-09 stsp return err;
3605 cf066bf8 2019-05-09 stsp static void
3606 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3608 24519714 2019-05-09 stsp free(ct->path);
3609 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3610 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3611 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3612 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3613 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3614 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3618 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3619 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3620 24519714 2019-05-09 stsp struct got_repository *repo;
3621 24519714 2019-05-09 stsp struct got_worktree *worktree;
3622 5f8a88c6 2019-08-03 stsp int have_staged_files;
3625 c4296144 2019-05-09 stsp static const struct got_error *
3626 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3627 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3628 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3629 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3631 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3632 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3633 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3634 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3635 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3636 768aea60 2019-05-09 stsp struct stat sb;
3638 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3639 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3640 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3641 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3642 5f8a88c6 2019-08-03 stsp return NULL;
3644 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3645 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3647 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3648 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
3649 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3650 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3651 5f8a88c6 2019-08-03 stsp return NULL;
3654 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3655 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3656 036813ee 2019-05-09 stsp goto done;
3658 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3659 036813ee 2019-05-09 stsp parent_path = strdup("");
3660 69960a46 2019-05-09 stsp if (parent_path == NULL)
3661 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3663 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3665 69960a46 2019-05-09 stsp return err;
3668 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3669 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3670 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3671 c4296144 2019-05-09 stsp goto done;
3674 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3675 768aea60 2019-05-09 stsp relpath) == -1) {
3676 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3677 768aea60 2019-05-09 stsp goto done;
3679 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3680 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3682 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3683 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
3684 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
3685 12463d8b 2019-12-13 stsp err = got_error_from_errno2("lstat",
3686 12463d8b 2019-12-13 stsp ct->ondisk_path);
3687 12463d8b 2019-12-13 stsp goto done;
3689 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
3690 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3691 768aea60 2019-05-09 stsp goto done;
3693 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3696 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3697 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3698 44d03001 2019-05-09 stsp relpath) == -1) {
3699 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3700 44d03001 2019-05-09 stsp goto done;
3703 cf066bf8 2019-05-09 stsp ct->status = status;
3704 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3705 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3706 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3707 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3708 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3709 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3710 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3711 b416585c 2019-05-13 stsp goto done;
3713 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3714 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3715 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3716 f0b75401 2019-08-03 stsp goto done;
3719 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3720 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3721 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3722 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3723 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3724 036813ee 2019-05-09 stsp goto done;
3727 24519714 2019-05-09 stsp ct->path = strdup(path);
3728 24519714 2019-05-09 stsp if (ct->path == NULL) {
3729 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3730 24519714 2019-05-09 stsp goto done;
3732 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3734 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3735 ed175427 2019-05-09 stsp free_commitable(ct);
3736 24519714 2019-05-09 stsp free(parent_path);
3737 036813ee 2019-05-09 stsp free(path);
3738 a129376b 2019-03-28 stsp return err;
3741 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
3742 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3743 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3744 036813ee 2019-05-09 stsp struct got_repository *);
3746 ed175427 2019-05-09 stsp static const struct got_error *
3747 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
3748 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3749 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3750 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3751 afa376bf 2019-05-09 stsp struct got_repository *repo)
3753 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3754 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3755 036813ee 2019-05-09 stsp char *subpath;
3757 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3758 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3759 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3761 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
3763 ed175427 2019-05-09 stsp return err;
3765 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3766 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3767 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3768 036813ee 2019-05-09 stsp free(subpath);
3769 036813ee 2019-05-09 stsp return err;
3772 036813ee 2019-05-09 stsp static const struct got_error *
3773 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3775 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3776 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3778 036813ee 2019-05-09 stsp *match = 0;
3780 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3781 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3782 0f63689d 2019-05-10 stsp return NULL;
3785 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3787 0f63689d 2019-05-10 stsp return err;
3788 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3789 036813ee 2019-05-09 stsp free(ct_parent_path);
3790 036813ee 2019-05-09 stsp return err;
3793 768aea60 2019-05-09 stsp static mode_t
3794 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3796 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3799 036813ee 2019-05-09 stsp static const struct got_error *
3800 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3801 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3803 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3805 036813ee 2019-05-09 stsp *new_te = NULL;
3807 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3809 036813ee 2019-05-09 stsp goto done;
3811 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3813 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3814 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3815 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3817 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3819 036813ee 2019-05-09 stsp if (err && *new_te) {
3820 56e0773d 2019-11-28 stsp free(*new_te);
3821 036813ee 2019-05-09 stsp *new_te = NULL;
3823 036813ee 2019-05-09 stsp return err;
3826 036813ee 2019-05-09 stsp static const struct got_error *
3827 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3828 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3830 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3831 036813ee 2019-05-09 stsp char *ct_name;
3833 036813ee 2019-05-09 stsp *new_te = NULL;
3835 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3836 036813ee 2019-05-09 stsp if (*new_te == NULL)
3837 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3839 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3840 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3841 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3842 036813ee 2019-05-09 stsp goto done;
3844 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
3845 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
3846 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
3847 036813ee 2019-05-09 stsp goto done;
3850 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3852 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3853 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3854 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3856 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3858 036813ee 2019-05-09 stsp if (err && *new_te) {
3859 56e0773d 2019-11-28 stsp free(*new_te);
3860 036813ee 2019-05-09 stsp *new_te = NULL;
3862 036813ee 2019-05-09 stsp return err;
3865 036813ee 2019-05-09 stsp static const struct got_error *
3866 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3867 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3869 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3870 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3872 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3874 036813ee 2019-05-09 stsp return err;
3875 036813ee 2019-05-09 stsp if (new_pe == NULL)
3876 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3877 036813ee 2019-05-09 stsp return NULL;
3880 afa376bf 2019-05-09 stsp static const struct got_error *
3881 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3882 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3884 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3885 5f8a88c6 2019-08-03 stsp unsigned char status;
3887 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3888 afa376bf 2019-05-09 stsp ct_path++;
3890 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3891 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3893 5f8a88c6 2019-08-03 stsp status = ct->status;
3895 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3896 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
3899 036813ee 2019-05-09 stsp static const struct got_error *
3900 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3901 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3903 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3904 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3905 44d03001 2019-05-09 stsp char *te_path;
3907 44d03001 2019-05-09 stsp *modified = 0;
3909 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3910 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3911 44d03001 2019-05-09 stsp te->name) == -1)
3912 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3914 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3915 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3916 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
3917 44d03001 2019-05-09 stsp strlen(te_path));
3918 44d03001 2019-05-09 stsp if (*modified)
3922 44d03001 2019-05-09 stsp free(te_path);
3923 44d03001 2019-05-09 stsp return err;
3926 44d03001 2019-05-09 stsp static const struct got_error *
3927 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
3928 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
3929 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
3931 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3932 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3934 036813ee 2019-05-09 stsp *ctp = NULL;
3936 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3937 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3938 036813ee 2019-05-09 stsp char *ct_name = NULL;
3939 036813ee 2019-05-09 stsp int path_matches;
3941 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3942 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
3943 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
3944 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
3947 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
3948 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
3952 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
3955 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3957 036813ee 2019-05-09 stsp return err;
3958 036813ee 2019-05-09 stsp if (!path_matches)
3961 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3962 036813ee 2019-05-09 stsp if (ct_name == NULL)
3963 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3965 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3968 036813ee 2019-05-09 stsp *ctp = ct;
3972 2b496619 2019-07-10 stsp return err;
3975 2b496619 2019-07-10 stsp static const struct got_error *
3976 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3977 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3978 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3979 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3980 2b496619 2019-07-10 stsp struct got_repository *repo)
3982 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3983 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3984 2b496619 2019-07-10 stsp char *subtree_path;
3985 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
3987 2b496619 2019-07-10 stsp *new_tep = NULL;
3989 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3990 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3991 2b496619 2019-07-10 stsp child_path) == -1)
3992 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3994 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3995 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
3996 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
3997 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3999 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4000 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
4001 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4002 2b496619 2019-07-10 stsp goto done;
4004 56e0773d 2019-11-28 stsp err = write_tree(&id, NULL, subtree_path,
4005 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
4006 2b496619 2019-07-10 stsp if (err) {
4007 56e0773d 2019-11-28 stsp free(new_te);
4008 2b496619 2019-07-10 stsp goto done;
4010 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
4013 2b496619 2019-07-10 stsp free(subtree_path);
4014 2b496619 2019-07-10 stsp if (err == NULL)
4015 2b496619 2019-07-10 stsp *new_tep = new_te;
4016 036813ee 2019-05-09 stsp return err;
4019 036813ee 2019-05-09 stsp static const struct got_error *
4020 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
4021 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
4022 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4023 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4024 036813ee 2019-05-09 stsp struct got_repository *repo)
4026 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4027 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
4028 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
4029 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4030 56e0773d 2019-11-28 stsp int nentries = 0;
4032 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
4034 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
4035 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4036 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4037 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
4039 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
4040 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
4041 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
4044 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
4045 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
4048 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4049 036813ee 2019-05-09 stsp pe->path);
4051 036813ee 2019-05-09 stsp goto done;
4053 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
4054 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
4055 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
4057 036813ee 2019-05-09 stsp goto done;
4058 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
4060 afa376bf 2019-05-09 stsp goto done;
4061 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
4062 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4064 2f51b5b3 2019-05-09 stsp goto done;
4065 56e0773d 2019-11-28 stsp nentries++;
4067 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
4068 2b496619 2019-07-10 stsp if (base_tree == NULL ||
4069 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
4070 2b496619 2019-07-10 stsp == NULL) {
4071 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
4072 2b496619 2019-07-10 stsp child_path, path_base_tree,
4073 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
4076 2b496619 2019-07-10 stsp goto done;
4077 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4079 2b496619 2019-07-10 stsp goto done;
4080 56e0773d 2019-11-28 stsp nentries++;
4085 2f51b5b3 2019-05-09 stsp if (base_tree) {
4086 56e0773d 2019-11-28 stsp int i, nbase_entries;
4087 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
4088 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
4089 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
4090 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4092 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
4093 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
4094 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
4095 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
4097 63c5ca5d 2019-08-24 stsp goto done;
4098 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
4100 63c5ca5d 2019-08-24 stsp goto done;
4101 56e0773d 2019-11-28 stsp nentries++;
4105 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
4106 44d03001 2019-05-09 stsp int modified;
4107 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4109 036813ee 2019-05-09 stsp goto done;
4110 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
4111 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4113 2f51b5b3 2019-05-09 stsp goto done;
4114 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4115 44d03001 2019-05-09 stsp if (modified) {
4116 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
4117 56e0773d 2019-11-28 stsp err = write_subtree(&new_id, te,
4118 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4119 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4121 44d03001 2019-05-09 stsp goto done;
4122 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
4123 56e0773d 2019-11-28 stsp sizeof(new_te->id));
4124 56e0773d 2019-11-28 stsp free(new_id);
4126 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4128 036813ee 2019-05-09 stsp goto done;
4129 56e0773d 2019-11-28 stsp nentries++;
4133 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4134 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4136 f66c734c 2019-09-22 stsp goto done;
4138 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4139 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4140 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4141 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4142 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4143 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
4145 2f51b5b3 2019-05-09 stsp goto done;
4146 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4148 2f51b5b3 2019-05-09 stsp goto done;
4149 56e0773d 2019-11-28 stsp nentries++;
4151 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
4152 b416585c 2019-05-13 stsp status_arg);
4154 afa376bf 2019-05-09 stsp goto done;
4156 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
4157 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4159 2f51b5b3 2019-05-09 stsp goto done;
4160 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4162 2f51b5b3 2019-05-09 stsp goto done;
4163 56e0773d 2019-11-28 stsp nentries++;
4168 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
4169 56e0773d 2019-11-28 stsp err = got_object_tree_create(new_tree_id, &paths, nentries, repo);
4171 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
4172 ed175427 2019-05-09 stsp return err;
4175 ebf99748 2019-05-09 stsp static const struct got_error *
4176 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4177 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4178 72fd46fa 2019-09-06 stsp int have_staged_files)
4180 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
4181 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
4183 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4184 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
4185 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4187 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4189 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
4190 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
4191 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
4192 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
4193 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
4194 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4195 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
4196 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
4197 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
4198 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
4199 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4200 72fd46fa 2019-09-06 stsp !have_staged_files);
4202 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
4203 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
4204 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4205 72fd46fa 2019-09-06 stsp !have_staged_files);
4207 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
4208 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
4209 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
4212 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
4217 d56d26ce 2019-05-10 stsp return err;
4221 d56d26ce 2019-05-10 stsp static const struct got_error *
4222 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
4223 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
4224 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
4225 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
4226 735ef5ac 2019-08-03 stsp int ood_errcode)
4228 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
4229 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
4231 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4232 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
4233 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4234 1a36436d 2019-06-10 stsp return NULL;
4236 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
4237 9bead371 2019-07-28 stsp * on matches file content in the branch head.
4239 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4240 735ef5ac 2019-08-03 stsp in_repo_path);
4241 9bead371 2019-07-28 stsp if (err) {
4242 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
4243 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
4244 1a36436d 2019-06-10 stsp goto done;
4245 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4246 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4248 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4249 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4250 735ef5ac 2019-08-03 stsp in_repo_path);
4251 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4252 1a36436d 2019-06-10 stsp goto done;
4253 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4257 1a36436d 2019-06-10 stsp return err;
4260 c4296144 2019-05-09 stsp const struct got_error *
4261 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4262 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4263 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4264 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4265 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4266 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4267 afa376bf 2019-05-09 stsp struct got_repository *repo)
4269 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4270 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4271 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4272 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4273 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4274 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4275 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4276 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4277 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4278 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4279 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4281 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4283 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4285 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4287 588edf97 2019-05-10 stsp goto done;
4289 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4291 588edf97 2019-05-10 stsp goto done;
4293 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4294 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4299 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4300 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4304 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4305 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4306 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4307 cf066bf8 2019-05-09 stsp char *ondisk_path;
4309 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4310 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4311 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4314 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4315 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
4316 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
4319 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4320 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4321 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4322 cf066bf8 2019-05-09 stsp goto done;
4324 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4325 a7055788 2019-05-09 stsp free(ondisk_path);
4327 cf066bf8 2019-05-09 stsp goto done;
4330 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4331 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4332 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
4334 036813ee 2019-05-09 stsp goto done;
4336 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4338 de18fc63 2019-05-09 stsp goto done;
4339 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4340 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4341 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4342 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4343 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4344 33ad4cbe 2019-05-12 jcs free(logmsg);
4346 9d40349a 2019-05-09 stsp goto done;
4348 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4349 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4350 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4351 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4352 09f5bd90 2019-05-09 stsp goto done;
4354 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4355 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4357 09f5bd90 2019-05-09 stsp goto done;
4358 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4360 ebf99748 2019-05-09 stsp goto done;
4361 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4362 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4363 09f5bd90 2019-05-09 stsp goto done;
4365 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4366 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4368 f2c16586 2019-05-09 stsp goto done;
4369 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4371 f2c16586 2019-05-09 stsp goto done;
4373 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4375 09f5bd90 2019-05-09 stsp goto done;
4377 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4379 ebf99748 2019-05-09 stsp goto done;
4381 588edf97 2019-05-10 stsp if (head_tree)
4382 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4383 588edf97 2019-05-10 stsp if (head_commit)
4384 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4385 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4386 2f17228e 2019-05-12 stsp if (head_ref2) {
4387 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4388 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4389 2f17228e 2019-05-12 stsp err = unlockerr;
4390 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4392 39cd0ff6 2019-07-12 stsp return err;
4395 5c1e53bc 2019-07-28 stsp static const struct got_error *
4396 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4397 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4399 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4400 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4402 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4403 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4404 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4406 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4407 5c1e53bc 2019-07-28 stsp ct_path++;
4409 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4410 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4414 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4415 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4417 5c1e53bc 2019-07-28 stsp return NULL;
4420 f0b75401 2019-08-03 stsp static const struct got_error *
4421 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4423 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4425 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4426 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4427 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4430 f0b75401 2019-08-03 stsp return NULL;
4433 5f8a88c6 2019-08-03 stsp static const struct got_error *
4434 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4435 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4437 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4438 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4440 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4441 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4443 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4444 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4445 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4446 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4447 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4448 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4451 5f8a88c6 2019-08-03 stsp return NULL;
4454 39cd0ff6 2019-07-12 stsp const struct got_error *
4455 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4456 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4457 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4458 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4459 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4460 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4462 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4463 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4464 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4465 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4466 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4467 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4468 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4469 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4470 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4472 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4474 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4476 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4478 39cd0ff6 2019-07-12 stsp goto done;
4480 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4482 39cd0ff6 2019-07-12 stsp goto done;
4484 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4486 39cd0ff6 2019-07-12 stsp goto done;
4488 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4490 39cd0ff6 2019-07-12 stsp goto done;
4492 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4493 5f8a88c6 2019-08-03 stsp &have_staged_files);
4494 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4495 5f8a88c6 2019-08-03 stsp goto done;
4496 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4497 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4499 5f8a88c6 2019-08-03 stsp goto done;
4502 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4503 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4504 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4505 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4506 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4507 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4508 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4510 5c1e53bc 2019-07-28 stsp goto done;
4513 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4514 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4515 39cd0ff6 2019-07-12 stsp goto done;
4518 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4519 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4521 5c1e53bc 2019-07-28 stsp goto done;
4524 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4525 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4526 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4528 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4529 f0b75401 2019-08-03 stsp ct_path++;
4530 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4531 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4532 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4534 b50cabdf 2019-07-12 stsp goto done;
4538 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4539 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4540 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4542 39cd0ff6 2019-07-12 stsp goto done;
4544 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4545 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
4546 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4547 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4548 39cd0ff6 2019-07-12 stsp err = sync_err;
4550 39cd0ff6 2019-07-12 stsp if (fileindex)
4551 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4552 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4553 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4554 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4555 39cd0ff6 2019-07-12 stsp err = unlockerr;
4556 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4557 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4558 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4560 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4561 c4296144 2019-05-09 stsp return err;
4564 8656d6c4 2019-05-20 stsp const char *
4565 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4567 8656d6c4 2019-05-20 stsp return ct->path;
4570 8656d6c4 2019-05-20 stsp unsigned int
4571 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4573 8656d6c4 2019-05-20 stsp return ct->status;
4576 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4577 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4578 818c7501 2019-07-11 stsp struct got_repository *repo;
4581 818c7501 2019-07-11 stsp static const struct got_error *
4582 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4584 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4585 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4586 818c7501 2019-07-11 stsp unsigned char status;
4587 818c7501 2019-07-11 stsp struct stat sb;
4588 818c7501 2019-07-11 stsp char *ondisk_path;
4590 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4591 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4592 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4593 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4595 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4597 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4599 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4600 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
4601 818c7501 2019-07-11 stsp free(ondisk_path);
4603 818c7501 2019-07-11 stsp return err;
4605 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4606 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4607 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4608 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4610 818c7501 2019-07-11 stsp return NULL;
4613 818c7501 2019-07-11 stsp const struct got_error *
4614 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4615 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4616 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4617 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4619 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4620 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4621 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4622 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4623 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4624 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4626 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4627 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4628 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4630 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4632 818c7501 2019-07-11 stsp return err;
4634 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4636 818c7501 2019-07-11 stsp goto done;
4638 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4639 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4640 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4643 818c7501 2019-07-11 stsp goto done;
4645 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4647 818c7501 2019-07-11 stsp goto done;
4649 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4651 818c7501 2019-07-11 stsp goto done;
4653 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4655 818c7501 2019-07-11 stsp goto done;
4657 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4660 818c7501 2019-07-11 stsp goto done;
4662 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4663 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4665 818c7501 2019-07-11 stsp goto done;
4666 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4668 818c7501 2019-07-11 stsp goto done;
4670 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4672 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4674 818c7501 2019-07-11 stsp goto done;
4676 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4678 818c7501 2019-07-11 stsp goto done;
4680 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4681 818c7501 2019-07-11 stsp worktree->base_commit_id);
4683 818c7501 2019-07-11 stsp goto done;
4684 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4686 818c7501 2019-07-11 stsp goto done;
4688 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4690 818c7501 2019-07-11 stsp goto done;
4692 818c7501 2019-07-11 stsp free(fileindex_path);
4693 818c7501 2019-07-11 stsp free(tmp_branch_name);
4694 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4695 818c7501 2019-07-11 stsp free(branch_ref_name);
4696 818c7501 2019-07-11 stsp if (branch_ref)
4697 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4698 818c7501 2019-07-11 stsp if (wt_branch)
4699 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4700 818c7501 2019-07-11 stsp if (err) {
4701 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4702 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4703 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4705 818c7501 2019-07-11 stsp if (*tmp_branch) {
4706 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4707 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4709 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4710 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4711 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4713 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4715 818c7501 2019-07-11 stsp return err;
4718 818c7501 2019-07-11 stsp const struct got_error *
4719 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4720 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4721 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4722 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4724 818c7501 2019-07-11 stsp const struct got_error *err;
4725 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4726 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4727 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4728 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4729 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4731 818c7501 2019-07-11 stsp *commit_id = NULL;
4732 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4733 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4734 3e3a69f1 2019-07-25 stsp *branch = NULL;
4735 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4737 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4739 3e3a69f1 2019-07-25 stsp return err;
4741 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4743 f032f1f7 2019-08-04 stsp goto done;
4745 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4746 f032f1f7 2019-08-04 stsp &have_staged_files);
4747 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4748 f032f1f7 2019-08-04 stsp goto done;
4749 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4750 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4751 3e3a69f1 2019-07-25 stsp goto done;
4754 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4756 f032f1f7 2019-08-04 stsp goto done;
4758 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4760 818c7501 2019-07-11 stsp goto done;
4762 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4764 818c7501 2019-07-11 stsp goto done;
4766 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4768 818c7501 2019-07-11 stsp goto done;
4770 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4772 818c7501 2019-07-11 stsp goto done;
4774 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4775 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4777 818c7501 2019-07-11 stsp goto done;
4779 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4781 818c7501 2019-07-11 stsp goto done;
4783 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4785 818c7501 2019-07-11 stsp goto done;
4787 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4788 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4790 818c7501 2019-07-11 stsp goto done;
4792 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4794 818c7501 2019-07-11 stsp goto done;
4796 818c7501 2019-07-11 stsp free(commit_ref_name);
4797 818c7501 2019-07-11 stsp free(branch_ref_name);
4798 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4799 818c7501 2019-07-11 stsp if (commit_ref)
4800 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4801 818c7501 2019-07-11 stsp if (branch_ref)
4802 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4803 818c7501 2019-07-11 stsp if (err) {
4804 818c7501 2019-07-11 stsp free(*commit_id);
4805 818c7501 2019-07-11 stsp *commit_id = NULL;
4806 818c7501 2019-07-11 stsp if (*tmp_branch) {
4807 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4808 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4810 818c7501 2019-07-11 stsp if (*new_base_branch) {
4811 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4812 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4814 818c7501 2019-07-11 stsp if (*branch) {
4815 818c7501 2019-07-11 stsp got_ref_close(*branch);
4816 818c7501 2019-07-11 stsp *branch = NULL;
4818 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4819 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4820 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4822 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4824 818c7501 2019-07-11 stsp return err;
4827 818c7501 2019-07-11 stsp const struct got_error *
4828 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4830 818c7501 2019-07-11 stsp const struct got_error *err;
4831 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4833 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4835 818c7501 2019-07-11 stsp return err;
4837 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4838 818c7501 2019-07-11 stsp free(tmp_branch_name);
4839 818c7501 2019-07-11 stsp return NULL;
4842 818c7501 2019-07-11 stsp static const struct got_error *
4843 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4844 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4846 0ebf8283 2019-07-24 stsp *logmsg = arg;
4847 818c7501 2019-07-11 stsp return NULL;
4850 818c7501 2019-07-11 stsp static const struct got_error *
4851 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4852 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4853 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4854 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4856 818c7501 2019-07-11 stsp return NULL;
4859 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4860 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4861 01757395 2019-07-12 stsp void *progress_arg;
4862 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4865 01757395 2019-07-12 stsp static const struct got_error *
4866 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4868 01757395 2019-07-12 stsp const struct got_error *err;
4869 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
4871 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
4873 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
4875 01757395 2019-07-12 stsp return err;
4877 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
4878 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
4879 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
4880 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
4881 01757395 2019-07-12 stsp return NULL;
4883 01757395 2019-07-12 stsp p = strdup(path);
4884 01757395 2019-07-12 stsp if (p == NULL)
4885 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
4887 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4888 01757395 2019-07-12 stsp if (err || new == NULL)
4890 01757395 2019-07-12 stsp return err;
4894 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4896 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4898 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
4899 01757395 2019-07-12 stsp free((char *)pe->path);
4901 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
4904 0ebf8283 2019-07-24 stsp static const struct got_error *
4905 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4906 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4908 818c7501 2019-07-11 stsp const struct got_error *err;
4909 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
4911 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4912 818c7501 2019-07-11 stsp if (err) {
4913 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
4914 818c7501 2019-07-11 stsp goto done;
4915 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4917 818c7501 2019-07-11 stsp goto done;
4918 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
4920 818c7501 2019-07-11 stsp goto done;
4922 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
4925 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
4927 818c7501 2019-07-11 stsp goto done;
4928 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
4929 818c7501 2019-07-11 stsp free(stored_id);
4930 818c7501 2019-07-11 stsp if (cmp != 0) {
4931 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4932 818c7501 2019-07-11 stsp goto done;
4936 0ebf8283 2019-07-24 stsp if (commit_ref)
4937 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4938 0ebf8283 2019-07-24 stsp return err;
4941 0ebf8283 2019-07-24 stsp static const struct got_error *
4942 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
4943 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
4944 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4945 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
4946 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4947 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4949 0ebf8283 2019-07-24 stsp const struct got_error *err;
4950 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4951 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
4952 3e3a69f1 2019-07-25 stsp char *fileindex_path;
4954 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4956 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4958 0ebf8283 2019-07-24 stsp return err;
4960 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
4961 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
4962 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
4963 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
4964 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
4965 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
4966 818c7501 2019-07-11 stsp if (commit_ref)
4967 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4968 818c7501 2019-07-11 stsp return err;
4971 818c7501 2019-07-11 stsp const struct got_error *
4972 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4973 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4974 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4975 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4976 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4977 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4979 0ebf8283 2019-07-24 stsp const struct got_error *err;
4980 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4982 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4984 0ebf8283 2019-07-24 stsp return err;
4986 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4988 0ebf8283 2019-07-24 stsp goto done;
4990 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4991 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4992 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4994 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4995 0ebf8283 2019-07-24 stsp return err;
4998 0ebf8283 2019-07-24 stsp const struct got_error *
4999 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5000 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5001 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5002 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5003 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5004 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5006 0ebf8283 2019-07-24 stsp const struct got_error *err;
5007 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5009 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5011 0ebf8283 2019-07-24 stsp return err;
5013 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
5015 0ebf8283 2019-07-24 stsp goto done;
5017 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5018 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5019 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5021 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5022 0ebf8283 2019-07-24 stsp return err;
5025 0ebf8283 2019-07-24 stsp static const struct got_error *
5026 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
5027 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5028 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5029 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5030 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
5032 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
5033 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5034 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5035 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5036 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
5037 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5038 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
5040 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5041 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
5043 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5045 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5047 3e3a69f1 2019-07-25 stsp return err;
5049 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5050 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
5051 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
5052 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
5054 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
5055 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
5056 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
5057 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
5059 01757395 2019-07-12 stsp if (merged_paths) {
5060 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5061 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
5062 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
5063 8f8646e5 2019-07-25 stsp goto done;
5065 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
5066 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
5067 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5070 01757395 2019-07-12 stsp goto done;
5073 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5074 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5076 01757395 2019-07-12 stsp goto done;
5079 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5080 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
5081 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5083 a0e95631 2019-07-12 stsp goto done;
5084 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5085 a0e95631 2019-07-12 stsp goto done;
5088 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5090 edd02c5e 2019-07-11 stsp goto done;
5092 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5094 818c7501 2019-07-11 stsp goto done;
5096 5943eee2 2019-08-13 stsp if (new_logmsg) {
5097 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
5098 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
5099 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5100 5943eee2 2019-08-13 stsp goto done;
5103 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5105 5943eee2 2019-08-13 stsp goto done;
5108 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
5109 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5110 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
5111 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
5112 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5114 a0e95631 2019-07-12 stsp goto done;
5116 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
5118 a0e95631 2019-07-12 stsp goto done;
5120 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5122 a0e95631 2019-07-12 stsp goto done;
5124 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5125 72fd46fa 2019-09-06 stsp fileindex, 0);
5126 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5127 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
5128 a0e95631 2019-07-12 stsp err = sync_err;
5130 a0e95631 2019-07-12 stsp free(fileindex_path);
5131 a0e95631 2019-07-12 stsp free(head_commit_id);
5132 a0e95631 2019-07-12 stsp if (head_ref)
5133 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
5134 818c7501 2019-07-11 stsp if (err) {
5135 818c7501 2019-07-11 stsp free(*new_commit_id);
5136 818c7501 2019-07-11 stsp *new_commit_id = NULL;
5138 818c7501 2019-07-11 stsp return err;
5141 818c7501 2019-07-11 stsp const struct got_error *
5142 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5143 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5144 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5145 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5146 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
5148 0ebf8283 2019-07-24 stsp const struct got_error *err;
5149 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5150 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5151 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5153 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5155 0ebf8283 2019-07-24 stsp return err;
5157 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5159 0ebf8283 2019-07-24 stsp goto done;
5160 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5162 0ebf8283 2019-07-24 stsp goto done;
5163 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5164 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5165 0ebf8283 2019-07-24 stsp goto done;
5168 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5169 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5171 0ebf8283 2019-07-24 stsp if (commit_ref)
5172 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5173 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5174 0ebf8283 2019-07-24 stsp free(commit_id);
5175 0ebf8283 2019-07-24 stsp return err;
5178 0ebf8283 2019-07-24 stsp const struct got_error *
5179 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5180 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5181 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5182 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5183 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
5184 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5186 0ebf8283 2019-07-24 stsp const struct got_error *err;
5187 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5188 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5189 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5191 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5193 0ebf8283 2019-07-24 stsp return err;
5195 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5197 0ebf8283 2019-07-24 stsp goto done;
5198 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5200 0ebf8283 2019-07-24 stsp goto done;
5201 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5202 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
5203 0ebf8283 2019-07-24 stsp goto done;
5206 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5207 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5209 0ebf8283 2019-07-24 stsp if (commit_ref)
5210 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5211 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5212 0ebf8283 2019-07-24 stsp free(commit_id);
5213 0ebf8283 2019-07-24 stsp return err;
5216 0ebf8283 2019-07-24 stsp const struct got_error *
5217 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
5218 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5220 3e3a69f1 2019-07-25 stsp if (fileindex)
5221 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5222 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
5225 69844fba 2019-07-11 stsp static const struct got_error *
5226 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
5228 69844fba 2019-07-11 stsp const struct got_error *err;
5229 69844fba 2019-07-11 stsp struct got_reference *ref;
5231 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
5232 69844fba 2019-07-11 stsp if (err) {
5233 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
5234 69844fba 2019-07-11 stsp return NULL;
5235 69844fba 2019-07-11 stsp return err;
5238 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
5239 69844fba 2019-07-11 stsp got_ref_close(ref);
5240 69844fba 2019-07-11 stsp return err;
5243 69844fba 2019-07-11 stsp static const struct got_error *
5244 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5246 69844fba 2019-07-11 stsp const struct got_error *err;
5247 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5248 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5250 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5252 69844fba 2019-07-11 stsp goto done;
5253 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5255 69844fba 2019-07-11 stsp goto done;
5257 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5259 69844fba 2019-07-11 stsp goto done;
5260 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5262 69844fba 2019-07-11 stsp goto done;
5264 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5266 69844fba 2019-07-11 stsp goto done;
5267 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5269 69844fba 2019-07-11 stsp goto done;
5271 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5273 69844fba 2019-07-11 stsp goto done;
5274 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5276 69844fba 2019-07-11 stsp goto done;
5279 69844fba 2019-07-11 stsp free(tmp_branch_name);
5280 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5281 69844fba 2019-07-11 stsp free(branch_ref_name);
5282 69844fba 2019-07-11 stsp free(commit_ref_name);
5283 69844fba 2019-07-11 stsp return err;
5286 818c7501 2019-07-11 stsp const struct got_error *
5287 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5288 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5289 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5290 818c7501 2019-07-11 stsp struct got_repository *repo)
5292 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5293 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5295 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5297 818c7501 2019-07-11 stsp return err;
5299 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5301 818c7501 2019-07-11 stsp goto done;
5303 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5305 818c7501 2019-07-11 stsp goto done;
5307 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5309 818c7501 2019-07-11 stsp goto done;
5311 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5313 3e3a69f1 2019-07-25 stsp if (fileindex)
5314 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5315 818c7501 2019-07-11 stsp free(new_head_commit_id);
5316 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5317 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5318 818c7501 2019-07-11 stsp err = unlockerr;
5319 818c7501 2019-07-11 stsp return err;
5322 818c7501 2019-07-11 stsp const struct got_error *
5323 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5324 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5325 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5326 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5328 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5329 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5330 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5331 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5332 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5333 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5335 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5337 818c7501 2019-07-11 stsp return err;
5339 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5340 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5342 818c7501 2019-07-11 stsp goto done;
5344 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5346 818c7501 2019-07-11 stsp goto done;
5349 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5350 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5351 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5353 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5355 818c7501 2019-07-11 stsp goto done;
5357 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5359 818c7501 2019-07-11 stsp goto done;
5361 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5362 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5364 ca355955 2019-07-12 stsp goto done;
5366 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5368 ca355955 2019-07-12 stsp goto done;
5370 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5372 818c7501 2019-07-11 stsp goto done;
5374 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5375 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5376 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5377 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5378 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5379 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5380 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5381 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5382 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5384 1f1abb7e 2019-08-08 stsp goto sync;
5386 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5387 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5389 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5390 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5391 ca355955 2019-07-12 stsp err = sync_err;
5393 818c7501 2019-07-11 stsp got_ref_close(resolved);
5394 a3a2faf2 2019-07-12 stsp free(tree_id);
5395 818c7501 2019-07-11 stsp free(commit_id);
5396 0ebf8283 2019-07-24 stsp if (fileindex)
5397 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5398 0ebf8283 2019-07-24 stsp free(fileindex_path);
5400 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5401 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5402 0ebf8283 2019-07-24 stsp err = unlockerr;
5403 0ebf8283 2019-07-24 stsp return err;
5406 0ebf8283 2019-07-24 stsp const struct got_error *
5407 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5408 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5409 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5410 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5412 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5413 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5414 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5415 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5416 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5417 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5418 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5419 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5421 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5422 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5423 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5424 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5426 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5428 0ebf8283 2019-07-24 stsp return err;
5430 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5432 0ebf8283 2019-07-24 stsp goto done;
5434 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5435 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5436 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5439 0ebf8283 2019-07-24 stsp goto done;
5441 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5443 0ebf8283 2019-07-24 stsp goto done;
5445 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5447 0ebf8283 2019-07-24 stsp goto done;
5449 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5450 0ebf8283 2019-07-24 stsp worktree);
5452 0ebf8283 2019-07-24 stsp goto done;
5454 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5457 0ebf8283 2019-07-24 stsp goto done;
5459 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5461 0ebf8283 2019-07-24 stsp goto done;
5463 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5465 0ebf8283 2019-07-24 stsp goto done;
5467 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5468 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5470 0ebf8283 2019-07-24 stsp goto done;
5471 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5473 0ebf8283 2019-07-24 stsp goto done;
5474 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5475 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5476 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5477 0ebf8283 2019-07-24 stsp goto done;
5480 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5481 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5483 0ebf8283 2019-07-24 stsp goto done;
5484 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5486 0ebf8283 2019-07-24 stsp goto done;
5488 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5490 0ebf8283 2019-07-24 stsp goto done;
5492 0ebf8283 2019-07-24 stsp free(fileindex_path);
5493 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5494 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5495 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5496 0ebf8283 2019-07-24 stsp if (wt_branch)
5497 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5498 0ebf8283 2019-07-24 stsp if (err) {
5499 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5500 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5501 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5503 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5504 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5505 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5507 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5508 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5509 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5510 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5512 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5514 0ebf8283 2019-07-24 stsp return err;
5517 0ebf8283 2019-07-24 stsp const struct got_error *
5518 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5519 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5521 3e3a69f1 2019-07-25 stsp if (fileindex)
5522 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5523 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5526 0ebf8283 2019-07-24 stsp const struct got_error *
5527 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5528 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5530 0ebf8283 2019-07-24 stsp const struct got_error *err;
5531 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5533 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5535 0ebf8283 2019-07-24 stsp return err;
5537 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5538 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5539 0ebf8283 2019-07-24 stsp return NULL;
5542 0ebf8283 2019-07-24 stsp const struct got_error *
5543 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5544 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5545 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5546 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5548 0ebf8283 2019-07-24 stsp const struct got_error *err;
5549 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5550 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5551 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5552 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5553 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5554 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5556 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5557 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5558 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5559 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5561 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5563 3e3a69f1 2019-07-25 stsp return err;
5565 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5567 f032f1f7 2019-08-04 stsp goto done;
5569 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5570 f032f1f7 2019-08-04 stsp &have_staged_files);
5571 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5572 f032f1f7 2019-08-04 stsp goto done;
5573 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5574 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5575 3e3a69f1 2019-07-25 stsp goto done;
5578 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5580 f032f1f7 2019-08-04 stsp goto done;
5582 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5584 0ebf8283 2019-07-24 stsp goto done;
5586 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5588 0ebf8283 2019-07-24 stsp goto done;
5590 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5591 0ebf8283 2019-07-24 stsp worktree);
5593 0ebf8283 2019-07-24 stsp goto done;
5595 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5597 0ebf8283 2019-07-24 stsp goto done;
5599 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5601 0ebf8283 2019-07-24 stsp goto done;
5602 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5604 0ebf8283 2019-07-24 stsp goto done;
5606 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5608 0ebf8283 2019-07-24 stsp goto done;
5609 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5611 0ebf8283 2019-07-24 stsp goto done;
5613 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5615 0ebf8283 2019-07-24 stsp goto done;
5617 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5618 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5619 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5620 0ebf8283 2019-07-24 stsp if (commit_ref)
5621 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5622 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5623 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5624 0ebf8283 2019-07-24 stsp if (err) {
5625 0ebf8283 2019-07-24 stsp free(*commit_id);
5626 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5627 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5628 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5629 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5630 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5631 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5633 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5634 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5635 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5637 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5639 0ebf8283 2019-07-24 stsp return err;
5642 0ebf8283 2019-07-24 stsp static const struct got_error *
5643 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5645 0ebf8283 2019-07-24 stsp const struct got_error *err;
5646 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5647 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5649 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5651 0ebf8283 2019-07-24 stsp goto done;
5652 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5654 0ebf8283 2019-07-24 stsp goto done;
5656 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5657 0ebf8283 2019-07-24 stsp worktree);
5659 0ebf8283 2019-07-24 stsp goto done;
5660 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5662 0ebf8283 2019-07-24 stsp goto done;
5664 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5666 0ebf8283 2019-07-24 stsp goto done;
5667 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5669 0ebf8283 2019-07-24 stsp goto done;
5671 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5673 0ebf8283 2019-07-24 stsp goto done;
5674 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5676 0ebf8283 2019-07-24 stsp goto done;
5678 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5679 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5680 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5681 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5682 0ebf8283 2019-07-24 stsp return err;
5685 0ebf8283 2019-07-24 stsp const struct got_error *
5686 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5687 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5688 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5689 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5691 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5692 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5693 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5694 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5695 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5697 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5699 0ebf8283 2019-07-24 stsp return err;
5701 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5702 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5704 0ebf8283 2019-07-24 stsp goto done;
5706 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5708 0ebf8283 2019-07-24 stsp goto done;
5710 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5712 0ebf8283 2019-07-24 stsp goto done;
5714 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5715 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5717 0ebf8283 2019-07-24 stsp goto done;
5719 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5721 0ebf8283 2019-07-24 stsp goto done;
5723 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5725 0ebf8283 2019-07-24 stsp goto done;
5727 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5728 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5729 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5730 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5731 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5732 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5733 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5734 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5735 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5737 1f1abb7e 2019-08-08 stsp goto sync;
5739 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5740 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5742 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5743 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5744 0ebf8283 2019-07-24 stsp err = sync_err;
5746 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5747 0ebf8283 2019-07-24 stsp free(tree_id);
5748 818c7501 2019-07-11 stsp free(fileindex_path);
5750 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5751 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5752 818c7501 2019-07-11 stsp err = unlockerr;
5753 818c7501 2019-07-11 stsp return err;
5756 0ebf8283 2019-07-24 stsp const struct got_error *
5757 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5758 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5759 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5761 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5762 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5763 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5765 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5767 0ebf8283 2019-07-24 stsp return err;
5769 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5770 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5772 0ebf8283 2019-07-24 stsp goto done;
5774 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5776 0ebf8283 2019-07-24 stsp goto done;
5778 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5780 0ebf8283 2019-07-24 stsp goto done;
5782 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5784 0ebf8283 2019-07-24 stsp goto done;
5786 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5788 3e3a69f1 2019-07-25 stsp if (fileindex)
5789 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5790 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5791 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5792 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5793 0ebf8283 2019-07-24 stsp err = unlockerr;
5794 0ebf8283 2019-07-24 stsp return err;
5797 0ebf8283 2019-07-24 stsp const struct got_error *
5798 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5799 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5801 0ebf8283 2019-07-24 stsp const struct got_error *err;
5802 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5804 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5806 0ebf8283 2019-07-24 stsp return err;
5808 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
5810 0ebf8283 2019-07-24 stsp goto done;
5812 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5814 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5815 2822a352 2019-10-15 stsp return err;
5818 2822a352 2019-10-15 stsp const struct got_error *
5819 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5820 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5821 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
5822 2822a352 2019-10-15 stsp struct got_repository *repo)
5824 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
5825 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5826 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
5828 2822a352 2019-10-15 stsp *fileindex = NULL;
5829 2822a352 2019-10-15 stsp *branch_ref = NULL;
5830 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5832 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
5834 2822a352 2019-10-15 stsp return err;
5836 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5837 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5838 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
5839 2822a352 2019-10-15 stsp "update -b or different branch name required");
5840 2822a352 2019-10-15 stsp goto done;
5843 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5845 2822a352 2019-10-15 stsp goto done;
5847 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
5848 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
5849 2822a352 2019-10-15 stsp ok_arg.repo = repo;
5850 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5853 2822a352 2019-10-15 stsp goto done;
5855 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
5857 2822a352 2019-10-15 stsp goto done;
5859 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
5860 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
5862 2822a352 2019-10-15 stsp if (err) {
5863 2822a352 2019-10-15 stsp if (*branch_ref) {
5864 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
5865 2822a352 2019-10-15 stsp *branch_ref = NULL;
5867 2822a352 2019-10-15 stsp if (*base_branch_ref) {
5868 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
5869 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5871 2822a352 2019-10-15 stsp if (*fileindex) {
5872 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
5873 2822a352 2019-10-15 stsp *fileindex = NULL;
5875 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
5877 0cb83759 2019-08-03 stsp return err;
5880 2822a352 2019-10-15 stsp const struct got_error *
5881 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
5882 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5883 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
5884 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5885 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5887 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
5888 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5889 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
5891 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
5893 2822a352 2019-10-15 stsp goto done;
5895 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
5897 2822a352 2019-10-15 stsp goto done;
5899 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
5900 2822a352 2019-10-15 stsp worktree->path_prefix);
5902 2822a352 2019-10-15 stsp goto done;
5904 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5906 2822a352 2019-10-15 stsp goto done;
5908 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
5909 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
5911 2822a352 2019-10-15 stsp goto sync;
5913 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
5915 2822a352 2019-10-15 stsp goto sync;
5917 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
5919 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5920 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
5921 2822a352 2019-10-15 stsp err = sync_err;
5924 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
5925 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5926 2822a352 2019-10-15 stsp err = unlockerr;
5927 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
5929 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
5930 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5931 2822a352 2019-10-15 stsp err = unlockerr;
5932 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
5934 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
5935 2822a352 2019-10-15 stsp free(fileindex_path);
5936 2822a352 2019-10-15 stsp free(tree_id);
5938 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5939 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5940 2822a352 2019-10-15 stsp err = unlockerr;
5941 2822a352 2019-10-15 stsp return err;
5944 2822a352 2019-10-15 stsp const struct got_error *
5945 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
5946 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5947 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
5949 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5951 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
5953 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
5955 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
5956 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
5957 8b692cd0 2019-10-21 stsp err = unlockerr;
5958 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
5960 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
5961 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
5962 8b692cd0 2019-10-21 stsp err = unlockerr;
5963 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
5965 8b692cd0 2019-10-21 stsp return err;
5968 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
5969 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
5970 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5971 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5972 2db2652d 2019-08-07 stsp struct got_repository *repo;
5973 2db2652d 2019-08-07 stsp int have_changes;
5976 2db2652d 2019-08-07 stsp const struct got_error *
5977 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
5978 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5979 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5980 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
5982 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
5983 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
5984 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
5985 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
5986 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
5987 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
5989 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
5990 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
5991 8b13ce36 2019-08-08 stsp return NULL;
5992 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5993 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
5995 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5996 735ef5ac 2019-08-03 stsp if (ie == NULL)
5997 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5999 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6000 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6001 735ef5ac 2019-08-03 stsp relpath) == -1)
6002 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
6004 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
6005 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
6006 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6007 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
6010 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
6011 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6012 3aa5969e 2019-08-06 stsp goto done;
6013 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
6014 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
6015 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
6016 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6017 735ef5ac 2019-08-03 stsp goto done;
6020 2db2652d 2019-08-07 stsp a->have_changes = 1;
6022 735ef5ac 2019-08-03 stsp p = in_repo_path;
6023 735ef5ac 2019-08-03 stsp while (p[0] == '/')
6025 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
6026 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
6027 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
6029 735ef5ac 2019-08-03 stsp free(in_repo_path);
6030 dc424a06 2019-08-07 stsp return err;
6033 2db2652d 2019-08-07 stsp struct stage_path_arg {
6034 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6035 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6036 2db2652d 2019-08-07 stsp struct got_repository *repo;
6037 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
6038 2db2652d 2019-08-07 stsp void *status_arg;
6039 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
6040 2db2652d 2019-08-07 stsp void *patch_arg;
6041 7b5dc508 2019-10-28 stsp int staged_something;
6044 2db2652d 2019-08-07 stsp static const struct got_error *
6045 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
6046 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6047 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6048 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6050 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
6051 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
6052 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
6053 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
6054 0cb83759 2019-08-03 stsp uint32_t stage;
6055 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
6057 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
6058 8b13ce36 2019-08-08 stsp return NULL;
6060 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6061 d3e7c587 2019-08-03 stsp if (ie == NULL)
6062 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6064 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6065 2db2652d 2019-08-07 stsp relpath)== -1)
6066 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
6068 0cb83759 2019-08-03 stsp switch (status) {
6069 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
6070 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
6071 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6072 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
6073 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6074 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6075 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
6078 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
6081 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
6082 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
6083 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
6084 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
6085 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
6089 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
6090 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
6093 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6094 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6095 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6096 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
6098 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
6099 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6100 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6101 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6103 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6104 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
6105 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
6107 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
6108 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
6110 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6111 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6112 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
6113 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
6116 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6118 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6119 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6123 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
6124 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6125 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6126 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6128 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6129 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6132 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
6134 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
6135 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6137 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
6138 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
6141 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6145 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
6146 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
6147 dc424a06 2019-08-07 stsp free(path_content);
6148 2db2652d 2019-08-07 stsp free(ondisk_path);
6149 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
6150 0ebf8283 2019-07-24 stsp return err;
6153 0cb83759 2019-08-03 stsp const struct got_error *
6154 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
6155 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
6156 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
6157 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6158 1e71573e 2019-08-03 stsp struct got_repository *repo)
6160 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6161 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
6162 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6163 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
6164 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
6165 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
6166 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
6167 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
6169 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6171 0cb83759 2019-08-03 stsp return err;
6173 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
6174 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
6176 735ef5ac 2019-08-03 stsp goto done;
6177 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6179 735ef5ac 2019-08-03 stsp goto done;
6180 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6182 0cb83759 2019-08-03 stsp goto done;
6184 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
6185 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
6186 2db2652d 2019-08-07 stsp oka.worktree = worktree;
6187 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
6188 2db2652d 2019-08-07 stsp oka.repo = repo;
6189 2db2652d 2019-08-07 stsp oka.have_changes = 0;
6190 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6191 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6192 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
6194 735ef5ac 2019-08-03 stsp goto done;
6196 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
6197 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6198 2db2652d 2019-08-07 stsp goto done;
6201 2db2652d 2019-08-07 stsp spa.worktree = worktree;
6202 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
6203 2db2652d 2019-08-07 stsp spa.repo = repo;
6204 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
6205 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
6206 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
6207 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
6208 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
6209 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6210 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6211 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
6213 2db2652d 2019-08-07 stsp goto done;
6215 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
6216 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6217 7b5dc508 2019-10-28 stsp goto done;
6220 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6221 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
6222 0cb83759 2019-08-03 stsp err = sync_err;
6224 735ef5ac 2019-08-03 stsp if (head_ref)
6225 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
6226 735ef5ac 2019-08-03 stsp free(head_commit_id);
6227 0cb83759 2019-08-03 stsp free(fileindex_path);
6228 0cb83759 2019-08-03 stsp if (fileindex)
6229 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
6230 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6231 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
6232 0cb83759 2019-08-03 stsp err = unlockerr;
6233 0cb83759 2019-08-03 stsp return err;
6236 ad493afc 2019-08-03 stsp struct unstage_path_arg {
6237 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
6238 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
6239 ad493afc 2019-08-03 stsp struct got_repository *repo;
6240 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
6241 ad493afc 2019-08-03 stsp void *progress_arg;
6242 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
6243 2e1f37b0 2019-08-08 stsp void *patch_arg;
6246 2e1f37b0 2019-08-08 stsp static const struct got_error *
6247 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
6248 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
6249 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
6250 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
6251 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
6253 2e1f37b0 2019-08-08 stsp const struct got_error *err;
6254 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
6255 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6256 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6257 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
6258 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
6259 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
6260 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
6261 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
6262 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6263 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
6265 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6266 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6268 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
6270 2e1f37b0 2019-08-08 stsp return err;
6271 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6273 2e1f37b0 2019-08-08 stsp goto done;
6275 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6277 2e1f37b0 2019-08-08 stsp goto done;
6279 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6281 2e1f37b0 2019-08-08 stsp goto done;
6283 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6285 2e1f37b0 2019-08-08 stsp goto done;
6287 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6289 2e1f37b0 2019-08-08 stsp goto done;
6291 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6293 2e1f37b0 2019-08-08 stsp goto done;
6295 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
6296 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
6297 2e1f37b0 2019-08-08 stsp goto done;
6300 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
6301 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
6302 2e1f37b0 2019-08-08 stsp goto done;
6305 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
6306 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6308 2e1f37b0 2019-08-08 stsp goto done;
6310 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
6311 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
6313 2e1f37b0 2019-08-08 stsp goto done;
6314 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
6315 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
6317 2e1f37b0 2019-08-08 stsp goto done;
6319 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
6320 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
6321 2e1f37b0 2019-08-08 stsp goto done;
6323 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
6324 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
6325 2e1f37b0 2019-08-08 stsp goto done;
6327 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6328 2e1f37b0 2019-08-08 stsp int choice;
6329 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
6330 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
6331 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
6332 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
6334 2e1f37b0 2019-08-08 stsp goto done;
6335 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
6336 2e1f37b0 2019-08-08 stsp have_content = 1;
6338 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
6339 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
6342 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
6343 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6344 f1e81a05 2019-08-10 stsp outfile, rejectfile);
6346 2e1f37b0 2019-08-08 stsp free(label1);
6348 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
6349 2e1f37b0 2019-08-08 stsp if (staged_blob)
6350 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
6351 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
6352 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
6353 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
6354 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
6355 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
6356 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
6357 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6358 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
6359 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
6360 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
6361 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
6362 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
6363 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
6364 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
6365 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
6366 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6367 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
6368 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
6369 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6371 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
6372 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
6373 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
6374 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6375 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
6376 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
6377 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6379 2e1f37b0 2019-08-08 stsp free(args);
6381 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
6384 2e1f37b0 2019-08-08 stsp if (changes)
6385 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
6386 2e1f37b0 2019-08-08 stsp free(path1);
6387 2e1f37b0 2019-08-08 stsp free(path2);
6388 2e1f37b0 2019-08-08 stsp return err;
6391 ad493afc 2019-08-03 stsp static const struct got_error *
6392 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
6393 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
6394 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6395 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6397 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
6398 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
6399 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
6400 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6401 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
6402 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
6403 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
6404 ad493afc 2019-08-03 stsp int local_changes_subsumed;
6405 9bc94a15 2019-08-03 stsp struct stat sb;
6407 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
6408 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
6409 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
6410 2e1f37b0 2019-08-08 stsp return NULL;
6412 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6413 ad493afc 2019-08-03 stsp if (ie == NULL)
6414 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6416 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6418 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
6420 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
6421 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
6423 f69721c3 2019-10-21 stsp goto done;
6424 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6425 f69721c3 2019-10-21 stsp id_str) == -1) {
6426 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
6427 f69721c3 2019-10-21 stsp goto done;
6430 ad493afc 2019-08-03 stsp switch (staged_status) {
6431 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
6432 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
6433 ad493afc 2019-08-03 stsp blob_id, 8192);
6436 ad493afc 2019-08-03 stsp /* fall through */
6437 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
6438 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6439 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
6440 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6441 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6442 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6445 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6448 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6449 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6450 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6451 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6452 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6453 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6455 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6456 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6457 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6458 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6462 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6463 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6464 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6466 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6467 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6468 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6469 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
6470 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
6471 f69721c3 2019-10-21 stsp a->progress_arg);
6472 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6473 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6474 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6475 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6476 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6479 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6480 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6483 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6484 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6485 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6486 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6487 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6488 ad493afc 2019-08-03 stsp if (err == NULL)
6489 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6490 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6492 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6493 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6494 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6495 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6496 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6499 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6501 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6502 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6506 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6507 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
6508 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
6511 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6515 ad493afc 2019-08-03 stsp free(ondisk_path);
6516 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6517 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6518 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6519 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6520 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6521 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6522 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6523 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6524 ad493afc 2019-08-03 stsp if (blob_base)
6525 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6526 ad493afc 2019-08-03 stsp if (blob_staged)
6527 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6528 f69721c3 2019-10-21 stsp free(id_str);
6529 f69721c3 2019-10-21 stsp free(label_orig);
6530 ad493afc 2019-08-03 stsp return err;
6533 ad493afc 2019-08-03 stsp const struct got_error *
6534 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6535 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6536 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6537 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6538 ad493afc 2019-08-03 stsp struct got_repository *repo)
6540 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6541 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6542 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6543 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6544 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6546 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6548 ad493afc 2019-08-03 stsp return err;
6550 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6552 ad493afc 2019-08-03 stsp goto done;
6554 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6555 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6556 ad493afc 2019-08-03 stsp upa.repo = repo;
6557 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6558 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6559 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6560 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6561 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6562 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6563 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
6565 ad493afc 2019-08-03 stsp goto done;
6568 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6569 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6570 ad493afc 2019-08-03 stsp err = sync_err;
6572 ad493afc 2019-08-03 stsp free(fileindex_path);
6573 ad493afc 2019-08-03 stsp if (fileindex)
6574 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6575 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6576 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6577 ad493afc 2019-08-03 stsp err = unlockerr;
6578 ad493afc 2019-08-03 stsp return err;
